Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/muc
Florian Schmaus 369878b6d9 Merge branch '4.1'
Conflicts:
	version.gradle
2015-03-11 20:51:08 +01:00
..
packet Merge branch '4.1' 2015-03-11 20:51:08 +01:00
provider Merge branch '4.1' 2015-03-04 22:42:36 +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 Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
DiscussionHistory.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02: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 Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02: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 Smack 4.1.0-rc3 2015-03-07 21:31:56 +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
ParticipantStatusListener.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
RoomInfo.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
SubjectUpdatedListener.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
UserStatusListener.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