summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-05-23 19:02:26 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-05-23 19:02:26 (GMT)
commit0c4eba31839a8174a8d7776b0f55fcbd12899d10 (patch)
treed12027713968332f98eee44e6671e95f0f5682ca /Swiften/Jingle/Jingle.h
parent182bdd709a57ab4d17f163ae28c5663fb3dd4287 (diff)
parent3f72e2c3b7ce5a83287dc136c68b7ef6d2cc66bd (diff)
downloadswift-0c4eba31839a8174a8d7776b0f55fcbd12899d10.zip
swift-0c4eba31839a8174a8d7776b0f55fcbd12899d10.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed const references to vectors. Conflicts: Swiften/Elements/JinglePayload.h Swiften/Jingle/JingleSession.h
Diffstat (limited to 'Swiften/Jingle/Jingle.h')
0 files changed, 0 insertions, 0 deletions