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
..
address	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
amp	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
attention/packet	Rename PacketFilter (and implementing classes) and PacketExtension	2015-02-28 13:49:38 +01:00
bookmarks	Xlint all the things	2015-03-23 09:28:49 +01:00
bytestreams	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
caps	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
chatstates	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
commands	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
delay	Substitute 'packet' with 'stanza(/packet)' in javadoc	2015-03-21 09:36:28 +01:00
disco	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
filetransfer	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
forward	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
geoloc	Add Support for XEP-80: User Location	2015-03-16 20:01:58 +01:00
iqlast	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
iqprivate	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
iqregister	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
iqversion	Merge Smack 4.1.0-rc2	2015-02-21 18:07:45 +01:00
jiveproperties	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
muc	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
nick/packet	Rename PacketFilter (and implementing classes) and PacketExtension	2015-02-28 13:49:38 +01:00
offline	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
pep	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
ping	Merge branch '4.1'	2015-03-04 22:42:36 +01:00
privacy	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
pubsub	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
receipts	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
rsm	Rename PacketFilter (and implementing classes) and PacketExtension	2015-02-28 13:49:38 +01:00
search	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
sharedgroups	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
shim	Rename PacketFilter (and implementing classes) and PacketExtension	2015-02-28 13:49:38 +01:00
si	's;^\s+$;;' on all source files	2015-03-17 11:33:02 +01:00
time	Use Jid (and subclasses) from jxmpp-jid	2015-02-17 16:07:16 +01:00
vcardtemp	Add missing break statements	2015-03-23 09:52:01 +01:00
xdata	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
xdatalayout	Rename PacketFilter (and implementing classes) and PacketExtension	2015-02-28 13:49:38 +01:00
xdatavalidation	Rename PacketFilter (and implementing classes) and PacketExtension	2015-02-28 13:49:38 +01:00
xhtmlim	Merge branch '4.1'	2015-03-24 17:16:18 +01:00