Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim
Florian Schmaus 83b84c5bd3 Merge branch '4.1'
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
2015-03-24 17:16:18 +01:00
..
packet Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
provider Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
XHTMLManager.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
XHTMLText.java Don't append closing body in XHTMLText.toString() 2015-01-07 15:00:28 +01:00