summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-20 18:32:23 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-20 18:32:23 (GMT)
commit4e72d079d8aa012185e445f334146f1e91db6a2d (patch)
tree40a1595bd30f93bbd628fbf52d92a523163b8206 /Swiften/Network/BoostTimerFactory.cpp
parentd0f5efabfe61347df011c3dab5e47a45b53e8b22 (diff)
parentd35f132d31241e7c2f09b4b2588a02c8a6ae249c (diff)
downloadswift-4e72d079d8aa012185e445f334146f1e91db6a2d.zip
swift-4e72d079d8aa012185e445f334146f1e91db6a2d.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Prioritize version files over git version. Improve the description in the Debian control file. Use a custom debian changelog.
Diffstat (limited to 'Swiften/Network/BoostTimerFactory.cpp')
0 files changed, 0 insertions, 0 deletions