Smack/smack-tcp/src/main/java/org/jivesoftware/smack
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
..
initializer/tcp Add StreamFeatureProvider 2014-09-11 23:58:07 +02:00
tcp Merge branch '4.0' 2014-10-22 22:25:20 +02:00