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
..
java/org/jivesoftware/smackx/debugger	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
resources/images	Move EnhancedDebugger's images to the correct location	2015-03-16 19:59:39 +01:00