summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2014-10-03 16:01:35 +0900
committerMichele Calgaro <[email protected]>2014-10-03 16:01:35 +0900
commit766cf0d6ec169831e5c0fccf219ed573de40039a (patch)
tree3f9a91fb63bcfc6b7ddd83d7cf8a58f92106965b
parent8353e7b75e96455446daa11dc5cdeda989a5fc9f (diff)
parent3fa95bcd396fddc752046d26e75f02d0701c1bff (diff)
downloadtde-766cf0d6ec169831e5c0fccf219ed573de40039a.tar.gz
tde-766cf0d6ec169831e5c0fccf219ed573de40039a.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
m---------main/applications/kopete-otr0
m---------main/tdebase0
2 files changed, 0 insertions, 0 deletions
diff --git a/main/applications/kopete-otr b/main/applications/kopete-otr
-Subproject e03192f5e249ab49dbd14672fb99bb258ef6729
+Subproject ec7b81f4205abd38d6feaa45be397a0eaf79737
diff --git a/main/tdebase b/main/tdebase
-Subproject c6c4c0e2a1ddecae1da3c8156dc2c97f40189f3
+Subproject 34cc40d9fb8f21485a467c2cfaba6fd0b063719