Smack/smack-debug/src/main/java/org/jivesoftware/smackx/debugger
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
..
EnhancedDebugger.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
EnhancedDebuggerWindow.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
LiteDebugger.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
package.html Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00