1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-23 02:58:00 +01:00
Smack/test/org/jivesoftware
Florian Schmaus b18a43920a Merge branch '3.4.0' into master
Conflicts:
	source/org/jivesoftware/smack/SmackConfiguration.java
2014-02-03 12:58:55 +01:00
..
smack SMACK-530 Moved DNSUtilTest to integration tests 2014-01-22 03:17:34 +00:00
smackx Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00