summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-10-01 11:47:34 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-10-01 11:47:34 (GMT)
commit0f9c50e7bf71d000f8576bd112bdfa25de1397eb (patch)
tree0a2e19cfdaf595b90f907720cf07fc0db972d8bc /Swiften/Elements/JingleFileTransferHash.h
parent6e345232b3a88e51f45149b039e1a27230a0bc2a (diff)
parent6a4a15088e7c97b3f6c1de179eee1defa2720bdb (diff)
downloadswift-contrib-0f9c50e7bf71d000f8576bd112bdfa25de1397eb.zip
swift-contrib-0f9c50e7bf71d000f8576bd112bdfa25de1397eb.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed roster sender check. Conflicts: Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp
Diffstat (limited to 'Swiften/Elements/JingleFileTransferHash.h')
0 files changed, 0 insertions, 0 deletions