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
..
packet	Introduce packet.Element	2014-07-05 11:59:45 +02:00
provider	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
InitiationListener.java	Add FlexiblePacketTypeFilter	2014-05-29 17:45:32 +02:00
Socks5BytestreamListener.java	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
Socks5BytestreamManager.java	Merge branch '4.0'	2014-07-14 14:31:09 +02:00
Socks5BytestreamRequest.java	Change IQ.Type to enum	2014-06-06 21:10:13 -03:00
Socks5BytestreamSession.java	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
Socks5Client.java	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
Socks5ClientForInitiator.java	Change IQ.Type to enum	2014-06-06 21:10:13 -03:00
Socks5Proxy.java	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
Socks5Utils.java	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00