vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-26 04:28:00 +01:00
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx
History
Florian Schmaus c540ac9703 Merge Smack 4.1.0-rc3 
Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	version.gradle
2015-03-07 21:31:56 +01:00
..
address Merge branch '4.1' 2015-03-04 22:42:36 +01:00
amp Merge branch '4.1' 2015-03-04 22:42:36 +01:00
attention/packet Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
bookmarks Expose InterruptedException 2015-02-14 14:57:33 +01:00
bytestreams Merge Smack 4.1.0-rc3 2015-03-07 21:31:56 +01:00
caps Merge branch '4.1' 2015-03-04 22:42:36 +01:00
chatstates Merge branch '4.1' 2015-03-04 22:42:36 +01:00
commands Merge branch '4.1' 2015-03-04 22:42:36 +01:00
delay Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
disco Merge branch '4.1' 2015-03-04 22:42:36 +01:00
filetransfer Merge branch '4.1' 2015-03-04 22:42:36 +01:00
forward Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
iqlast Merge branch '4.1' 2015-03-04 22:42:36 +01:00
iqprivate Expose InterruptedException 2015-02-14 14:57:33 +01:00
iqregister Merge branch '4.1' 2015-03-04 22:42:36 +01:00
iqversion Merge Smack 4.1.0-rc2 2015-02-21 18:07:45 +01:00
jiveproperties Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
muc Merge Smack 4.1.0-rc3 2015-03-07 21:31:56 +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-04 22:42:36 +01:00
pep Merge branch '4.1' 2015-03-04 22:42:36 +01:00
ping Merge branch '4.1' 2015-03-04 22:42:36 +01:00
privacy Merge branch '4.1' 2015-03-04 22:42:36 +01:00
pubsub Merge Smack 4.1.0-rc3 2015-03-07 21:31:56 +01:00
receipts Merge branch '4.1' 2015-03-04 22:42:36 +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-04 22:42:36 +01:00
sharedgroups Expose InterruptedException 2015-02-14 14:57:33 +01:00
shim Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
si Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
time Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
vcardtemp Merge branch '4.1' 2015-03-04 22:42:36 +01:00
xdata Merge branch '4.1' 2015-03-04 22:42:36 +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-04 22:42:36 +01:00