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
..
extensions	Merge branch smack_3_3_2 and trunk	2013-12-30 01:29:55 +01:00
images	Extension was renamed to lowercase.	2004-08-19 17:17:40 +00:00
connections.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
debugging.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
gettingstarted.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
index.html	HTML and comment cleanup. Small API refactors. Moved use of StringBuffer to StringBuilder.	2008-11-03 16:28:57 +00:00
messaging.html	Merged the 3.2 Beta branch into trunk.	2011-03-14 01:53:42 +00:00
overview.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
privacy.html	HTML and comment cleanup. Small API refactors. Moved use of StringBuffer to StringBuilder.	2008-11-03 16:28:57 +00:00
processing.html	SMACK-279: The XMPPConnection extends the new abstract Connection class	2010-02-09 11:55:56 +00:00
properties.html	HTML and comment cleanup. Small API refactors. Moved use of StringBuffer to StringBuilder.	2008-11-03 16:28:57 +00:00
providers.html	HTML and comment cleanup. Small API refactors. Moved use of StringBuffer to StringBuilder.	2008-11-03 16:28:57 +00:00
roster.html	add the ability to register for roster events before logging in (SMACK-156)	2010-08-15 16:32:09 +00:00
style.css	Initial check-in.	2003-01-15 15:03:36 +00:00