Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/muc
Florian Schmaus 94a16ba41e Merge branch '4.0'
Conflicts:
	build.gradle
	documentation/connections.html
	documentation/gettingstarted.html
	smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
	smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
	smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
	smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
2014-07-05 14:37:22 +02:00
..
packet s/JEP/XEP/ 2014-06-14 11:48:46 +02:00
provider Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
Affiliate.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ConnectionDetachedPacketCollector.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
DeafOccupantInterceptor.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
DefaultParticipantStatusListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
DefaultUserStatusListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
DiscussionHistory.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
HostedRoom.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
InvitationListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
InvitationRejectionListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
MultiUserChat.java Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
Occupant.java Use jxmpp-core (0.1.0-alpha1-SNAPSHOT) 2014-06-01 12:24:30 +02:00
PacketMultiplexListener.java Add FlexiblePacketTypeFilter 2014-05-29 17:45:32 +02:00
ParticipantStatusListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
RoomInfo.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
RoomListenerMultiplexor.java Don't remove the MUC listeners after a disconnect 2014-06-02 16:58:53 +02:00
SubjectUpdatedListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
UserStatusListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
package.html Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00