Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-20 18:32:23 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-20 18:32:23 (GMT) |
| commit | 4e72d079d8aa012185e445f334146f1e91db6a2d (patch) | |
| tree | 40a1595bd30f93bbd628fbf52d92a523163b8206 /Swiften/Jingle/IncomingJingleSessionHandler.cpp | |
| parent | d0f5efabfe61347df011c3dab5e47a45b53e8b22 (diff) | |
| parent | d35f132d31241e7c2f09b4b2588a02c8a6ae249c (diff) | |
| download | swift-contrib-4e72d079d8aa012185e445f334146f1e91db6a2d.zip swift-contrib-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/Jingle/IncomingJingleSessionHandler.cpp')
0 files changed, 0 insertions, 0 deletions