vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-16 00:24:49 +02:00
Code Issues Releases Wiki Activity
Smack/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup
History
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
..
agent Merge branch '4.1' 2015-03-24 17:16:18 +01:00
ext Merge branch '4.1' 2015-03-24 17:16:18 +01:00
packet Merge branch '4.1' 2015-03-24 17:16:18 +01:00
settings Merge branch '4.1' 2015-03-24 17:16:18 +01:00
user Merge branch '4.1' 2015-03-24 17:16:18 +01:00
util Enable more 'checkstyle' checks 2014-08-15 23:17:45 +02:00
MetaData.java Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
QueueUser.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
WorkgroupInvitation.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
WorkgroupInvitationListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00