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
build	Versioning updates for new release.	2013-10-07 02:42:12 +00:00
documentation	Merge branch smack_3_3_2 and trunk	2013-12-30 01:29:55 +01:00
jingle/extension	SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software.	2013-04-07 19:15:32 +00:00
sample	Fixed smack sample for updated API	2009-09-03 08:42:07 +00:00
source	Merge branch smack_3_3_2 and trunk	2013-12-30 01:29:55 +01:00
test	Merge branch smack_3_3_2 and trunk	2013-12-30 01:29:55 +01:00
test-unit/org/jivesoftware	Merge branch smack_3_3_2 and trunk	2013-12-30 01:29:55 +01:00
Makefile	Makefile: added javadoc target	2013-02-14 00:00:02 +00:00