Florian Schmaus 34bc13bec7 Merge branch '4.0' ... Conflicts: build.gradle smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java		2014-09-05 22:11:35 +02:00
..
Bind.java	Set jid to passed parameter, not null	2014-08-23 18:41:35 +02:00
DefaultPacketExtension.java	Fix typo in XmlStringBuilder, it's not an Angel	2014-08-20 21:25:14 +02:00
Element.java	Introduce packet.Element	2014-07-05 11:59:45 +02:00
IQ.java	Fix typo in XmlStringBuilder, it's not an Angel	2014-08-20 21:25:14 +02:00
Message.java	Add XmlLangStanza, to share the language field	2014-09-03 18:11:32 +02:00
package.html	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
Packet.java	Remove xmlns field from Packet	2014-09-03 17:56:51 +02:00
PacketExtension.java	Introduce packet.Element	2014-07-05 11:59:45 +02:00
Presence.java	Add XmlLangStanza, to share the language field	2014-09-03 18:11:32 +02:00
Registration.java	Fix typo in XmlStringBuilder, it's not an Angel	2014-08-20 21:25:14 +02:00
RosterPacket.java	Fix typo in XmlStringBuilder, it's not an Angel	2014-08-20 21:25:14 +02:00
Session.java	Change IQ.Type to enum	2014-06-06 21:10:13 -03:00
StreamError.java	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
XmlLangStanza.java	Add XmlLangStanza, to share the language field	2014-09-03 18:11:32 +02:00
XMPPError.java	Merge branch '4.0'	2014-09-05 22:11:35 +02:00