Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-10-01 11:47:34 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-10-01 11:47:34 (GMT) |
| commit | 0f9c50e7bf71d000f8576bd112bdfa25de1397eb (patch) | |
| tree | 0a2e19cfdaf595b90f907720cf07fc0db972d8bc /Swift/QtUI/ChatView/main.cpp | |
| parent | 6e345232b3a88e51f45149b039e1a27230a0bc2a (diff) | |
| parent | 6a4a15088e7c97b3f6c1de179eee1defa2720bdb (diff) | |
| download | swift-0f9c50e7bf71d000f8576bd112bdfa25de1397eb.zip swift-0f9c50e7bf71d000f8576bd112bdfa25de1397eb.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Fixed roster sender check.
Conflicts:
Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp
Diffstat (limited to 'Swift/QtUI/ChatView/main.cpp')
0 files changed, 0 insertions, 0 deletions