vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-26 05:52:06 +01:00
Code Issues Releases Wiki Activity
Smack/test-unit/org/jivesoftware
History
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
..
smack SMACK-452 Correctly parse stream error packets 2013-10-09 17:02:34 +00:00
smackx Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00
util SMACK-458 Managers should be kept on disconnects 2013-10-26 11:17:16 +00:00