summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-05-01 20:17:42 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-05-01 20:17:42 (GMT)
commitda300eb81a91b8e4cc9db0a9ca692d1a1891b429 (patch)
treeb9ffc93fbf437fc4bb635a82c86d36e21deca028 /Swiften/Disco/SConscript
parentd94737ef177524014fbf9b1ee2b446825536514b (diff)
parent4fb9430a2e16b3ddf59ccbc1f267e8c98422ca6e (diff)
downloadswift-da300eb81a91b8e4cc9db0a9ca692d1a1891b429.zip
swift-da300eb81a91b8e4cc9db0a9ca692d1a1891b429.tar.bz2
Merge branch 'swift-1.x'
Conflicts: Swiften/History/HistoryManager.h Swiften/SConscript
Diffstat (limited to 'Swiften/Disco/SConscript')
0 files changed, 0 insertions, 0 deletions