1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-05 03:35:59 +01:00
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/muc
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 Merge branch '4.1' 2015-03-24 17:16:18 +01:00
provider Merge branch '4.1' 2015-03-24 17:16:18 +01:00
Affiliate.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
DefaultParticipantStatusListener.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
DefaultUserStatusListener.java Add roomDestroyed callback to MUC UserStatusListener 2015-03-17 09:51:20 +01:00
DiscussionHistory.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
HostedRoom.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
InvitationListener.java Change muc.InvitationListner to use the MUC instance 2014-12-30 01:30:13 +01:00
InvitationRejectionListener.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
MUCAffiliation.java Introduce MUCRole and MUCAffiliation enums 2014-08-24 18:30:18 +02:00
MUCNotJoinedException.java Rework MultiUserChat 2014-10-13 11:10:30 +02:00
MUCRole.java Introduce MUCRole and MUCAffiliation enums 2014-08-24 18:30:18 +02:00
MultiUserChat.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
MultiUserChatManager.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
Occupant.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
package.html Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ParticipantStatusListener.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
RoomInfo.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
SubjectUpdatedListener.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
UserStatusListener.java Add roomDestroyed callback to MUC UserStatusListener 2015-03-17 09:51:20 +01:00