1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-20 10:24:49 +02:00
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates
Florian Schmaus 83b84c5bd3 Merge branch '4.1'
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
2015-03-24 17:16:18 +01:00
..
packet Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
ChatState.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ChatStateListener.java Create smack-im subproject for XMPP-IM 2015-01-26 07:54:05 +01:00
ChatStateManager.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00