Smack/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup
Florian Schmaus 2079ba6bd6 Merge branch '4.1'
Conflicts:
	smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
2015-05-27 22:50:55 +02:00
..
agent Merge branch '4.1' 2015-05-27 22:50:55 +02:00
ext Add JavadocPackage checkstyle 2015-04-04 17:16:47 +02:00
packet Merge branch '4.1' 2015-05-27 22:50:55 +02:00
settings Add JavadocPackage checkstyle 2015-04-04 17:16:47 +02:00
user Add JavadocPackage checkstyle 2015-04-04 17:16:47 +02:00
util Add JavadocPackage checkstyle 2015-04-04 17:16:47 +02:00
MetaData.java Enable javadoc checkstyle 2015-03-29 12:29:32 +02:00
QueueUser.java Enable javadoc checkstyle 2015-03-29 12:29:32 +02:00
WorkgroupInvitation.java Enable javadoc checkstyle 2015-03-29 12:29:32 +02:00
WorkgroupInvitationListener.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
package-info.java Add JavadocPackage checkstyle 2015-04-04 17:16:47 +02:00