1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-09-28 18:49:49 +02:00
Smack/smack-extensions/src/integration-test/java/org/jivesoftware/smackx
Florian Schmaus 94a16ba41e Merge branch '4.0'
Conflicts:
	build.gradle
	documentation/connections.html
	documentation/gettingstarted.html
	smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
	smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
	smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
	smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
2014-07-05 14:37:22 +02:00
..
bytestreams
commands Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
entitycaps
muc
packet
pubsub Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
CompressionTest.java
FileTransferTest.java
FormTest.java
GroupChatInvitationTest.java
LastActivityManagerTest.java
MessageEventManagerTest.java
MessageEventTests.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
MultipleRecipientManagerTest.java
OfflineMessageManagerTest.java s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
RosterExchangeManagerTest.java
RosterExchangeTests.java
ServiceDiscoveryManagerTest.java
SharedGroupsTest.java
VCardTest.java
VersionTest.java
XHTMLManagerTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
XHTMLSupportTests.java