1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-13 15:14:54 +02:00
Smack/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb
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
..
packet 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
provider 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
CloseListenerTest.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
DataListenerTest.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
IBBPacketUtils.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
IBBTestsSuite.java Init Base64 test encoder for unit-tests 2014-09-07 17:22:55 +02:00
InBandBytestreamManagerTest.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
InBandBytestreamRequestTest.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
InBandBytestreamSessionMessageTest.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
InBandBytestreamSessionTest.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
InitiationListenerTest.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00