Florian Schmaus b18a43920a Merge branch '3.4.0' into master ... Conflicts: source/org/jivesoftware/smack/SmackConfiguration.java		2014-02-03 12:58:55 +01:00
..
bytestreams	SMACK-524 Use correct block-size definition for IBB transfers	2014-01-17 11:24:07 +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
forward	SMACK-434 (and 529) Added support for experimental code, that is XEP's that have not yet made it to the draft state.	2014-01-31 03:41:25 +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-434 Added missing javadoc and some test code cleanup	2014-01-31 03:49:47 +00:00
provider	SMACK-286 Made ProviderManager much more configurable.	2014-01-16 05:14:39 +00:00
pubsub	SMACK-434 (and 529) Added support for experimental code, that is XEP's that have not yet made it to the draft state.	2014-01-31 03:41:25 +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