1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-12-23 21:17:58 +01:00
Smack/test
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
..
config SMACK-389 Plugable compression framework 2013-02-26 09:26:41 +00:00
org/jivesoftware Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00