Smack/smack-core/src/test/java/org/jivesoftware/smack
Florian Schmaus 701aa7d9c4 Merge branch '4.1'
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
	smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
	smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.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/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
	smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
	version.gradle
2015-03-04 22:42:36 +01:00
..
filters Merge branch '4.1' 2015-03-04 22:42:36 +01:00
packet Merge branch '4.1' 2015-03-04 22:42:36 +01:00
parsing Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
provider Rework Smack Provider design 2014-10-08 16:01:14 +02:00
sasl Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
test/util Merge branch '4.1' 2015-03-04 22:42:36 +01:00
util Rename 'Packet' class to 'Stanza' 2015-02-06 09:34:51 +01:00
DummyConnection.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
PacketCollectorTest.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
SmackConfigurationTest.java Split SmackConfiguration into Configuration and Initalization 2014-09-05 15:56:00 +02:00
SmackExceptionTest.java Use Exception.getString in HostAddress 2015-01-18 19:21:58 +01:00
StanzaIdTest.java Rename 'Packet' class to 'Stanza' 2015-02-06 09:34:51 +01:00
ThreadedDummyConnection.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00