Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-12-04 20:22:07 +01:00
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams
History
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
..
ibb Merge branch '4.0' 2014-07-14 14:31:09 +02:00
socks5 Merge branch '4.0' 2014-07-14 14:31:09 +02:00
BytestreamListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
BytestreamManager.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
BytestreamRequest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
BytestreamSession.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00