Florian Schmaus 34bc13bec7 Merge branch '4.0' ... Conflicts: build.gradle smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java		2014-09-05 22:11:35 +02:00
..
filters	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
packet	Enable more 'checkstyle' checks	2014-08-15 23:17:45 +02:00
parsing	Merge branch '4.0'	2014-09-05 22:11:35 +02:00
provider	Enable more 'checkstyle' checks	2014-08-15 23:17:45 +02:00
rosterstore	Create org.jivesoftware.smack.rosterstore package	2014-08-16 15:37:16 +02:00
sasl	Add smack-android and redesign SASL authentication	2014-08-01 10:34:47 +02:00
test/util	Use CharSequence instead of String in parseContent()	2014-07-06 21:10:40 +02:00
util	Merge branch '4.0'	2014-09-05 22:11:35 +02:00
ChatConnectionTest.java	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
DummyConnection.java	Enable more 'checkstyle' checks	2014-08-15 23:17:45 +02:00
PacketCollectorTest.java	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
RosterTest.java	Enable more 'checkstyle' checks	2014-08-15 23:17:45 +02:00
RosterVersioningTest.java	Create org.jivesoftware.smack.rosterstore package	2014-08-16 15:37:16 +02:00
SmackConfigurationTest.java	Split SmackConfiguration into Configuration and Initalization	2014-09-05 15:56:00 +02:00
StanzaIdTest.java	Add StanzaIdTest	2014-08-13 13:56:23 +02:00
ThreadedDummyConnection.java	Change IQ.Type to enum	2014-06-06 21:10:13 -03:00