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	Change IQ.Type to enum	2014-06-06 21:10:13 -03:00
main	Merge branch '4.0'	2014-08-07 16:51:03 +02:00
test	Add smack-android and redesign SASL authentication	2014-08-01 10:34:47 +02:00