summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-21 13:39:29 -0600
committerTimothy Pearson <[email protected]>2013-02-21 13:39:29 -0600
commita50eeaa98b88a50aae3f53e6c9fb83b7de0b45b2 (patch)
treea06e0f1478197f000556cf818f0f72a39912b405
parent7fa19995dcd14875b8356639a9f38d6fb5573826 (diff)
parent2028e8151fb04d0884a404f7f0c6005d2f96b326 (diff)
downloadkiosktool-a50eeaa98b88a50aae3f53e6c9fb83b7de0b45b2.tar.gz
kiosktool-a50eeaa98b88a50aae3f53e6c9fb83b7de0b45b2.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kiosktool
m---------admin0
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin
-Subproject 02e2842b6f2a692e432f4ebc10fbe3759a15347
+Subproject d3351c945e680cea403e463eb9898467db140ec