Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-05-23 19:02:26 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-05-23 19:02:26 (GMT) |
| commit | 0c4eba31839a8174a8d7776b0f55fcbd12899d10 (patch) | |
| tree | d12027713968332f98eee44e6671e95f0f5682ca /3rdParty/DocBook/XSL/params/htmlhelp.button.jump2.title.xml | |
| parent | 182bdd709a57ab4d17f163ae28c5663fb3dd4287 (diff) | |
| parent | 3f72e2c3b7ce5a83287dc136c68b7ef6d2cc66bd (diff) | |
| download | swift-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 '3rdParty/DocBook/XSL/params/htmlhelp.button.jump2.title.xml')
0 files changed, 0 insertions, 0 deletions