1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-23 20:04:51 +02:00
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet
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
..
Destroy.java Immutable objects must not implemented TypedCloneable 2015-03-12 13:12:39 +01:00
GroupChatInvitation.java Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
MUCAdmin.java Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
MUCInitialPresence.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
MUCItem.java Xlint all the things 2015-03-23 09:28:49 +01:00
MUCOwner.java Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
MUCUser.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00