Smack/smack-tcp/src/main/java/org/jivesoftware/smack/tcp
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
..
sm Rework Smack Provider design 2014-10-08 16:01:14 +02:00
XMPPTCPConnection.java Merge branch '4.0' 2014-10-22 22:25:20 +02:00