summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-21 13:38:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-21 13:38:37 -0600
commitf2f6f06f786ee96257f304dd47285f32e711ac24 (patch)
treec0b15af74eef2255511429482fa8cd1b4b3dabe8
parente6bf1f35962fc96efc02b5b0bf8959b7f2327ce6 (diff)
parentddbcc1e8dd5e69731e36e393358abafe24a8713a (diff)
downloadk3b-f2f6f06f786ee96257f304dd47285f32e711ac24.tar.gz
k3b-f2f6f06f786ee96257f304dd47285f32e711ac24.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/k3b
m---------admin0
1 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin
-Subproject 02e2842b6f2a692e432f4ebc10fbe3759a15347
+Subproject d3351c945e680cea403e463eb9898467db140ec