summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-19 09:22:06 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-19 09:22:06 (GMT)
commitd4a48f83e856b380f6bf19eb19ea0b80ceef20ab (patch)
tree9b1a9c77d53e0ec2de61b0bc62cbfcd00013843c /Swiften/Jingle/JingleSessionManager.cpp
parent6eabee840343d99d92dd4c2f627cb52ff3b97886 (diff)
parent62afc432fa7ba9ac06409e27676cd41480dcf3b8 (diff)
downloadswift-d4a48f83e856b380f6bf19eb19ea0b80ceef20ab.zip
swift-d4a48f83e856b380f6bf19eb19ea0b80ceef20ab.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed conditional in package script.
Diffstat (limited to 'Swiften/Jingle/JingleSessionManager.cpp')
0 files changed, 0 insertions, 0 deletions