Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-10-31 19:29:52 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-10-31 19:29:52 (GMT) |
| commit | 2eb088cc2b0e26780359fc55993d656bb54b1882 (patch) | |
| tree | f18718536913a0b5948664a80f4343b85ec79696 /Swift/QtUI/QtConnectionSettings.ui | |
| parent | d7b73e460adab34f5bf0cc0038ffa21bd6b6c53a (diff) | |
| parent | 68a59bf7ef72857d730e650887355911bc72c6e6 (diff) | |
| download | swift-2eb088cc2b0e26780359fc55993d656bb54b1882.zip swift-2eb088cc2b0e26780359fc55993d656bb54b1882.tar.bz2 | |
Merge branch 'swift-2.x'
* swift-2.x:
Update Hebrew translation
Don't install the overrides for other packages in swift-im
Update Debian building for latest lintian rules
Don't allow passing NULL to the JID ctor
Conflicts:
Swift/Packaging/Debian/debian/control.in
Change-Id: Iadbd434627e190d7369aa61f67ab211e4fbcf02a
Diffstat (limited to 'Swift/QtUI/QtConnectionSettings.ui')
0 files changed, 0 insertions, 0 deletions