vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer
History
Florian Schmaus 94a16ba41e Merge branch '4.0' 
Conflicts:
	build.gradle
	documentation/connections.html
	documentation/gettingstarted.html
	smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
	smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
	smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
	smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
 		2014-07-05 14:37:22 +02:00
..
FaultTolerantNegotiator.java Refactor FileTransfer(Manager|Negotiator) 2014-07-02 09:52:40 +02:00
FileTransfer.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
FileTransferListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
FileTransferManager.java Remove some duplicate code from smackx.filetransfer 2014-07-04 23:17:15 +02:00
FileTransferNegotiator.java Merge branch '4.0' 2014-07-05 14:37:22 +02:00
FileTransferRequest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
IBBTransferNegotiator.java Introduce packet.Element 2014-07-05 11:59:45 +02:00
IncomingFileTransfer.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
OutgoingFileTransfer.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
Socks5TransferNegotiator.java Introduce packet.Element 2014-07-05 11:59:45 +02:00
StreamNegotiator.java Merge branch '4.0' 2014-07-05 14:37:22 +02:00