vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media
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
..
ContentInfo.java Renamed smack-jingle to smack-jingle-old 2014-08-20 00:26:02 +02:00
JingleMediaManager.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
JingleMediaSession.java Renamed smack-jingle to smack-jingle-old 2014-08-20 00:26:02 +02:00
MediaNegotiator.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
MediaReceivedListener.java Renamed smack-jingle to smack-jingle-old 2014-08-20 00:26:02 +02:00
PayloadType.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00