Florian Schmaus 94a16ba41e Merge branch '4.0' ... Conflicts: build.gradle documentation/connections.html documentation/gettingstarted.html smack-core/src/main/java/org/jivesoftware/smack/SmackException.java smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java		2014-07-05 14:37:22 +02:00
..
libs	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
src	Merge branch '4.0'	2014-07-05 14:37:22 +02:00
build.gradle	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00