vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/source/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 Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00
smackx Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00