Smack/smack-core/src/integration-test/java/org/jivesoftware/smack/packet
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
..
MockPacket.java Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
MockPacketFilter.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
PrivacyProviderTest.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
PrivacyTest.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00