1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-26 05:14:49 +02:00
Smack/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5
Florian Schmaus 83b84c5bd3 Merge branch '4.1'
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
2015-03-24 17:16:18 +01:00
..
InitiationListenerTest.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
Socks5ByteStreamManagerTest.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
Socks5ByteStreamRequestTest.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
Socks5ClientForInitiatorTest.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
Socks5ClientTest.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
Socks5PacketUtils.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
Socks5ProxyTest.java Cleanup Bytestream and Streamhost 2014-08-19 19:24:57 +02:00
Socks5TestProxy.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00