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
..
src	Merge branch '4.0'	2014-08-07 16:51:03 +02:00
.gitignore	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
build.gradle	Add smack-android and redesign SASL authentication	2014-08-01 10:34:47 +02:00