1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-17 09:42:05 +01: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 Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
commands Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
entitycaps Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
muc Remove decorators for "Legacy Delayed Delivery" 2014-07-01 23:29:45 +02:00
packet Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
pubsub Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
CompressionTest.java Merge branch '4.0' 2014-07-05 14:37:22 +02:00
FileTransferTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
FormTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
GroupChatInvitationTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
LastActivityManagerTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
MessageEventManagerTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
MessageEventTests.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
MultipleRecipientManagerTest.java s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
OfflineMessageManagerTest.java s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
RosterExchangeManagerTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
RosterExchangeTests.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ServiceDiscoveryManagerTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
SharedGroupsTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
VCardTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
VersionTest.java Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
XHTMLManagerTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
XHTMLSupportTests.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00