diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-08 16:46:41 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-08 16:46:41 -0500 |
commit | 1fd109c786b06dba3c2175a930ffa56e22d9a2ce (patch) | |
tree | d10a10f51b4591ee681910b6b1878fdd7eb896ee | |
parent | 5e8526e2220823231373a72287a1567d596abf43 (diff) | |
parent | 277e57daa407aeaa0a374a9e087384b1ca65a3f3 (diff) | |
download | kima-1fd109c786b06dba3c2175a930ffa56e22d9a2ce.tar.gz kima-1fd109c786b06dba3c2175a930ffa56e22d9a2ce.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kima
m--------- | admin | 0 | ||||
m--------- | cmake | 0 |
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 |