Florian Schmaus 83b84c5bd3 Merge branch '4.1' ... Conflicts: smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java version.gradle		2015-03-24 17:16:18 +01:00
..
filter	Rename PacketFilter (and implementing classes) and PacketExtension	2015-02-28 13:49:38 +01:00
packet	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
provider	Add more checkstyle tests	2015-03-17 22:02:44 +01:00
PrivacyList.java	's;^\s+$;;' on all source files	2015-03-17 11:33:02 +01:00
PrivacyListListener.java	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
PrivacyListManager.java	Merge branch '4.1'	2015-03-24 17:16:18 +01:00