Florian Schmaus fbf0ba13ce Merge Smack 4.1.0-rc2 ... Conflicts: smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java version.gradle		2015-02-21 18:07:45 +01:00
..
java/org/jivesoftware/smack	Merge Smack 4.1.0-rc2	2015-02-21 18:07:45 +01:00
resources/org.jivesoftware.smack.tcp	Move Stream Management code into o.j.smack.sm	2015-01-18 11:07:47 +01:00