Florian Schmaus f8274dda53 Merge branch smack_3_3_2 and trunk ... as the state of the both branches of Smack's SVN repository http://fisheye.igniterealtime.org/browse/smack on 2013-12-30. Conflicts: documentation/extensions/caps.html source/org/jivesoftware/smack/PacketReader.java source/org/jivesoftware/smack/SmackConfiguration.java source/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java source/org/jivesoftware/smackx/ServiceDiscoveryManager.java		2013-12-30 01:29:55 +01:00
..
caps.html	Merge branch smack_3_3_2 and trunk	2013-12-30 01:29:55 +01:00
dataforms.html	Initial version.	2004-06-07 01:37:55 +00:00
disco.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
filetransfer.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
index.html	UI updates.	2003-08-29 18:47:39 +00:00
intro.html	SMACK-431 Reworded Entity Caps documentation, added missing frame link	2013-06-24 21:27:43 +00:00
invitation.html	Added group chat invitation docs.	2003-10-13 15:39:11 +00:00
messageevents.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
muc.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
privatedata.html	UI updates.	2003-08-29 18:47:39 +00:00
pubsub.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
rosterexchange.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
style.css	UI updates.	2003-08-29 18:47:39 +00:00
time.html	UI updates.	2003-08-29 18:47:39 +00:00
toc.html	SMACK-431 Entity Capabilities are now enabled as default for new connections. Added an extensions documentation html page.	2013-06-22 17:01:58 +00:00
xhtml.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00