vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-29 15:32:06 +01:00
Code Issues Releases Wiki Activity
Smack/smack-jingle/src
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
..
demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
integration-test Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
main/java/org/jivesoftware/smackx/jingle Merge branch '4.0' 2014-07-05 14:37:22 +02:00