vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/muc
History
Florian Schmaus 701aa7d9c4 Merge branch '4.1' 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
	smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
	smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
	smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
	version.gradle
 		2015-03-04 22:42:36 +01:00
..
packet Merge branch '4.1' 2015-03-04 22:42:36 +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 branch '4.1' 2015-03-04 22:42:36 +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