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
..
cache	Merge from 3.3 branch	2013-05-18 16:56:52 +00:00
packet	SMACK-361 Added support for Entity Capabilities.	2013-03-18 08:50:48 +00:00
provider	SMACK-361 Some general code cleanup added some missing hashcode methods and added back some removed public API methods (marked as deprecated).	2013-03-31 14:24:50 +00:00
EntityCapsManager.java	Merge branch smack_3_3_2 and trunk	2013-12-30 01:29:55 +01:00