Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-07-12 18:47:03 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-07-12 18:47:03 (GMT) |
| commit | 63b311c1bb60469eb5e2ccd2107739e11b189a15 (patch) | |
| tree | 870057043f88e91b71b961a821a4dace859fc839 /3rdParty/DocBook/XSL/params/column.count.back.xml | |
| parent | c6819a5fd632d03cfe72a58922054765c7383aa6 (diff) | |
| parent | 08536b4ed31c30a25a343c3c2619676e67a0c692 (diff) | |
| download | swift-63b311c1bb60469eb5e2ccd2107739e11b189a15.zip swift-63b311c1bb60469eb5e2ccd2107739e11b189a15.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Fixed bug with illegal resource in JID resulting in empty resource.
Updated the german translation
Conflicts:
Swiften/IDN/StringPrep.cpp
Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
Diffstat (limited to '3rdParty/DocBook/XSL/params/column.count.back.xml')
0 files changed, 0 insertions, 0 deletions