1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-16 04:12:04 +01:00
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts
Florian Schmaus 7735a5224c Merge branch '4.0'
Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.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/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
2014-07-14 14:31:09 +02:00
..
DeliveryReceipt.java Improve DeliveryReceipt code, add javadoc 2014-07-13 11:39:01 +02:00
DeliveryReceiptManager.java Merge branch '4.0' 2014-07-14 14:31:09 +02:00
DeliveryReceiptRequest.java Improve DeliveryReceipt code, add javadoc 2014-07-13 11:39:01 +02:00
ReceiptReceivedListener.java Improve DeliveryReceipt code, add javadoc 2014-07-13 11:39:01 +02:00