1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-25 04:44:49 +02:00
Smack/smack-tcp/src/main
Florian Schmaus 369878b6d9 Merge branch '4.1'
Conflicts:
	version.gradle
2015-03-11 20:51:08 +01:00
..
java/org/jivesoftware/smack Merge branch '4.1' 2015-03-11 20:51:08 +01:00
resources/org.jivesoftware.smack.tcp Move Stream Management code into o.j.smack.sm 2015-01-18 11:07:47 +01:00