Smack/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5
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
..
InitiationListenerTest.java Merge branch '4.0' 2014-07-14 14:31:09 +02:00
Socks5ByteStreamManagerTest.java Merge branch '4.0' 2014-07-14 14:31:09 +02:00
Socks5ByteStreamRequestTest.java Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
Socks5ClientForInitiatorTest.java Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
Socks5ClientTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
Socks5PacketUtils.java Remove some duplicate IQ code 2014-07-04 23:51:00 +02:00
Socks5ProxyTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
Socks5TestProxy.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00