summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-04-18 19:00:37 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2013-04-18 19:00:37 -0500
commitfe9127cae915a6b1ce2d80fb06b85ba2bbec6ef8 (patch)
treef2cbad85ca354f5c5bc4ba8bb6be765c4fe60170
parent961f1e31e967e64fe5d3ddc776c7521027e0ffb5 (diff)
parent82cf5ce09d4949e394b40028e5f0585677473d2e (diff)
downloadkdiff3-fe9127cae915a6b1ce2d80fb06b85ba2bbec6ef8.tar.gz
kdiff3-fe9127cae915a6b1ce2d80fb06b85ba2bbec6ef8.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kdiff3
m---------admin0
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin
-Subproject 4027b878fb556a51ed29affd578e78aa7099748
+Subproject 307fab5fdad542247fa11a418be0e9635f4b5eb