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
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
..
listeners 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
media Merge branch '4.1' 2015-03-24 17:16:18 +01:00
mediaimpl Merge branch '4.1' 2015-03-24 17:16:18 +01:00
nat Merge branch '4.1' 2015-03-24 17:16:18 +01:00
packet Merge branch '4.1' 2015-03-24 17:16:18 +01:00
provider Xlint all the things 2015-03-23 09:28:49 +01:00
ContentNegotiator.java Expose InterruptedException 2015-02-14 14:57:33 +01:00
JingleActionEnum.java Renamed smack-jingle to smack-jingle-old 2014-08-20 00:26:02 +02:00
JingleException.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
JingleManager.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
JingleNegotiator.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
JingleNegotiatorState.java Renamed smack-jingle to smack-jingle-old 2014-08-20 00:26:02 +02:00
JingleSession.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
JingleSessionRequest.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
JingleSessionState.java Expose InterruptedException 2015-02-14 14:57:33 +01:00
JingleSessionStateActive.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
JingleSessionStateEnded.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
JingleSessionStatePending.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
JingleSessionStateUnknown.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00