Smack/smack-core/src/main/java/org/jivesoftware/smack/parsing
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
..
ExceptionLoggingCallback.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
ExceptionThrowingCallback.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ParsingExceptionCallback.java javadoc: s/packet/stanza/ 2015-03-24 17:15:50 +01:00
UnparsablePacket.java Use CharSequence instead of String in parseContent() 2014-07-06 21:10:40 +02:00