1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-26 05:52:06 +01:00
Smack/documentation/extensions
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
..
caps.html Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00
dataforms.html s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
disco.html s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
filetransfer.html Merge branch '4.0' 2014-07-05 14:37:22 +02:00
hoxt.html Added support for HOXT (XEP-0332) 2014-03-20 12:36:04 +02:00
index.html UI updates. 2003-08-29 18:47:39 +00:00
intro.html s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
invitation.html s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
messageevents.html Merge branch '4.0' 2014-07-05 14:37:22 +02:00
muc.html s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
privacy.html Cleanup of PrivacyList API 2014-03-10 15:32:17 +01:00
privatedata.html s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
properties.html Move Packet 'properties' from core to extensions 2014-04-26 19:13:27 +02:00
pubsub.html Renamed Connection to XMPPConnection 2014-03-10 09:45:50 +01:00
rosterexchange.html Merge branch '4.0' 2014-07-05 14:37:22 +02:00
style.css UI updates. 2003-08-29 18:47:39 +00:00
time.html s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
toc.html Add missing HOXT entry in toc.html 2014-04-26 19:19:29 +02:00
xhtml.html s/JEP/XEP/ 2014-06-14 11:48:46 +02:00