summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-21 13:39:09 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-21 13:39:09 -0600
commit8606efc757b5d862327d86cfd07b0047a135a46b (patch)
tree07ad38557ea9cb23bad9d4a094dace8f8d55624b
parentcc4cd840bbc776613ab127c0e2275c85e219c97a (diff)
parent963e0b3d3ecc6b167f5209318477ba2a08fccbf5 (diff)
downloadkdiff3-8606efc757b5d862327d86cfd07b0047a135a46b.tar.gz
kdiff3-8606efc757b5d862327d86cfd07b0047a135a46b.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 02e2842b6f2a692e432f4ebc10fbe3759a15347
+Subproject d3351c945e680cea403e463eb9898467db140ec