vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle
History
Florian Schmaus 94a16ba41e Merge branch '4.0' 
Conflicts:
	build.gradle
	documentation/connections.html
	documentation/gettingstarted.html
	smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
	smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
	smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
	smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
 		2014-07-05 14:37:22 +02:00
..
listeners Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
media Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
mediaimpl Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
nat Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
packet Merge branch '4.0' 2014-07-05 14:37:22 +02:00
provider Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ContentNegotiator.java Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
JingleActionEnum.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
JingleException.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
JingleManager.java Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
JingleNegotiator.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
JingleNegotiatorState.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
JingleSession.java Remove some duplicate IQ code 2014-07-04 23:51:00 +02:00
JingleSessionRequest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
JingleSessionState.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
JingleSessionStateActive.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
JingleSessionStateEnded.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
JingleSessionStatePending.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
JingleSessionStateUnknown.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00