summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-06-08 16:50:55 -0500
committerDarrell Anderson <[email protected]>2012-06-08 16:50:55 -0500
commit69b86e46ec4181b124637affd2af402886a05404 (patch)
tree71f0cdc9406ae4f1e7d0903f99aa5f1361cab115
parentf841742f60a6536deca3879ff072784a9724f785 (diff)
parent595208925e155f3e70c33c10a45abed67d18406b (diff)
downloadkmyfirewall-69b86e46ec4181b124637affd2af402886a05404.tar.gz
kmyfirewall-69b86e46ec4181b124637affd2af402886a05404.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kmyfirewall
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