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
..
bookmark
bytestreams
commands
debugger
entitycaps	Merge branch smack_3_3_2 and trunk	2013-12-30 01:29:55 +01:00
filetransfer
muc
packet	Merge branch smack_3_3_2 and trunk	2013-12-30 01:29:55 +01:00
ping
provider
pubsub
receipts
search
workgroup
ChatState.java
ChatStateListener.java
ChatStateManager.java
DefaultMessageEventRequestListener.java
Form.java
FormField.java
GroupChatInvitation.java
LastActivityManager.java
MessageEventManager.java
MessageEventNotificationListener.java
MessageEventRequestListener.java
MultipleRecipientInfo.java
MultipleRecipientManager.java
NodeInformationProvider.java
OfflineMessageHeader.java
OfflineMessageManager.java
package.html
PEPListener.java
PEPManager.java
PrivateDataManager.java
RemoteRosterEntry.java
ReportedData.java
RosterExchangeListener.java
RosterExchangeManager.java
ServiceDiscoveryManager.java	Merge branch smack_3_3_2 and trunk	2013-12-30 01:29:55 +01:00
SharedGroupManager.java
XHTMLManager.java
XHTMLText.java