1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-23 02:58:00 +01:00
Smack/test-unit/org/jivesoftware/smackx
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
..
bytestreams SMACK-458 Managers should be kept on disconnects 2013-10-26 11:17:16 +00:00
entitycaps Merge from 3.3 branch 2013-05-18 16:56:52 +00:00
filetransfer SMACK-458 Managers should be kept on disconnects 2013-10-26 11:17:16 +00:00
muc SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software. 2013-04-07 19:15:32 +00:00
ping SMACK-412 Abstracted the keepalive implementation and set the thread to start and stop on demand. 2013-04-16 01:39:17 +00:00
provider improved Delay Information Parser (fixes SMACK-243) 2010-08-15 13:20:48 +00:00
pubsub SMACK-415 Added fix for handling the empty tag case. 2013-04-27 15:37:21 +00:00
receipts SMACK-458 Managers should be kept on disconnects 2013-10-26 11:17:16 +00:00
VCardUnitTest.java SMACK-413 fixed vCard parsing regarding the PHOTO element. Moved vCard test cases to unit-test where appropriate. Added testcases for vCard PHOTO parsing. 2013-03-23 00:30:59 +00:00