summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-06-08 16:52:41 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-06-08 16:52:41 -0500
commite96ec163358fda977325f831e882f660a3b79f38 (patch)
tree9183909582d431f77de9147f2589d240d073094f
parent9ed478e0dcc46fcc9578ba53a65ae4e412e1f7bd (diff)
parent2153920bbc8d1fb491c780ffe45745bfec6a6061 (diff)
downloadknemo-e96ec163358fda977325f831e882f660a3b79f38.tar.gz
knemo-e96ec163358fda977325f831e882f660a3b79f38.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/knemo
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