vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb
History
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 javadoc: s/packet/stanza/ 2015-03-24 17:15:50 +01:00
provider Merge branch '4.1' 2015-03-24 17:16:18 +01:00
CloseListener.java Expose InterruptedException 2015-02-14 14:57:33 +01:00
DataListener.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
InBandBytestreamListener.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
InBandBytestreamManager.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
InBandBytestreamRequest.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
InBandBytestreamSession.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
InitiationListener.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00