vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-extensions/src
History
Florian Schmaus 92a6d01507 Merge branch '4.0' 
Also slightly improve OfflineMessageManager.getMessages()

Conflicts:
	build.gradle
	smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
 		2014-08-07 16:51:03 +02:00
..
integration-test/java/org/jivesoftware/smackx Merge branch '4.0' 2014-07-05 14:37:22 +02:00
main Merge branch '4.0' 2014-08-07 16:51:03 +02:00
test Use createPacketCollectorAndSend in FileTransferNegoiator 2014-08-04 20:04:39 +02:00