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
..
packet	's;^\s+$;;' on all source files	2015-03-17 11:33:02 +01:00
provider	Make Provider.parse() just throw Exception	2015-03-13 09:27:18 +01:00
AbstractNodeInformationProvider.java	Rename PacketFilter (and implementing classes) and PacketExtension	2015-02-28 13:49:38 +01:00
NodeInformationProvider.java	Substitute 'packet' with 'stanza(/packet)' in javadoc	2015-03-21 09:36:28 +01:00
ServiceDiscoveryManager.java	Merge branch '4.1'	2015-03-24 17:16:18 +01:00