1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-23 02:58:00 +01:00
Smack/smack-core/src
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
..
integration-test Rename 'Packet' class to 'Stanza' 2015-02-06 09:34:51 +01:00
main Merge Smack 4.1.0-rc2 2015-02-21 18:07:45 +01:00
test Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00