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
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
..
ibb Merge branch '4.1' 2015-03-24 17:16:18 +01:00
socks5 Merge branch '4.1' 2015-03-24 17:16:18 +01:00
BytestreamListener.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
BytestreamManager.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
BytestreamRequest.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
BytestreamSession.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00