Smack/smack-extensions/src/test/java/org/jivesoftware/util
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
..
ConnectionUtils.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
Protocol.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
Verification.java Rename 'Packet' class to 'Stanza' 2015-02-06 09:34:51 +01:00