1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-06-18 09:34:53 +02:00
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx
Florian Schmaus 701aa7d9c4 Merge branch '4.1'
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
	smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
	smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
	smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
	version.gradle
2015-03-04 22:42:36 +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 branch '4.1' 2015-03-04 22:42:36 +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 branch '4.1' 2015-03-04 22:42:36 +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 branch '4.1' 2015-03-04 22:42:36 +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