1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-17 00:44:50 +02:00
Smack/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet
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
..
Jingle.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
JingleContent.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
JingleContentDescription.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
JingleContentInfo.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
JingleDescription.java Xlint all the things 2015-03-23 09:28:49 +01:00
JingleError.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
JingleTransport.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00