Florian Schmaus 1ed5c48bcc Merge branch '4.0' ... Conflicts: smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java		2014-07-16 10:52:58 +02:00
..
src	Merge branch '4.0'	2014-07-16 10:52:58 +02:00
.gitignore	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
build.gradle	Use jxmpp 0.2.0	2014-07-15 23:32:19 +02:00