summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-06-08 16:49:04 -0500
committerDarrell Anderson <[email protected]>2012-06-08 16:49:04 -0500
commitf0addefd078189860fa07c5f898ddd8fd5cdcd87 (patch)
tree45f5a93169c6e87e445fc7e2ea1b77c1a6cf2647
parent43508d556daf559d403f52bb293fc58e067642d3 (diff)
parent8b6ac27d6cae8120f6c21131c60a9542b7454ce0 (diff)
downloadkiosktool-f0addefd078189860fa07c5f898ddd8fd5cdcd87.tar.gz
kiosktool-f0addefd078189860fa07c5f898ddd8fd5cdcd87.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kiosktool
m---------admin0
m---------cmake0
2 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin
-Subproject 4af57bf22967e6ad80ab898980ed505df6eae5b
+Subproject 06098efaf31973c11d7dd89ae291e6844b132e1
diff --git a/cmake b/cmake
-Subproject d2f658ca47faefe569bcd1885b9238691fa1328
+Subproject e47cc63e66a12ca6b740500b76f385336ee40db