vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-tcp/src/main
History
Florian Schmaus 177ab983d4 Merge branch '4.0' 
Conflicts:
	build.gradle
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
 		2014-10-22 22:25:20 +02:00
..
java/org/jivesoftware/smack Merge branch '4.0' 2014-10-22 22:25:20 +02:00
resources/org.jivesoftware.smack Add StreamFeatureProvider 2014-09-11 23:58:07 +02:00