Smack/smack-core/src/integration-test/java/org/jivesoftware/smack
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
..
filter Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
packet Merge branch '4.1' 2015-03-24 17:16:18 +01:00
test 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
util 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
ChatTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
FloodTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
IQTest.java Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
LoginTest.java Add Integration Test Framework 2015-03-18 11:09:56 +01:00
MessageTest.java Add XMPPConnection.sendStanza(Stanza) 2015-03-04 21:46:44 +01:00
PacketReaderTest.java Add XMPPConnection.sendStanza(Stanza) 2015-03-04 21:46:44 +01:00
PresenceTest.java Add XMPPConnection.sendStanza(Stanza) 2015-03-04 21:46:44 +01:00
PrivacyClient.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ReconnectionTest.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
RosterInitializedBeforeConnectTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
RosterListenerTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
RosterSmackTest.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00