Smack/smack-im/src/main/java/org/jivesoftware/smack/roster
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
..
packet Improve Roster API 2015-05-27 22:34:43 +02:00
provider Improve Roster API 2015-05-27 22:34:43 +02:00
rosterstore Improve Roster API 2015-05-27 22:34:43 +02:00
AbstractRosterListener.java Add Roster.addSubscribeListener() 2015-05-21 22:41:21 +02:00
Roster.java Improve Roster API 2015-05-27 22:34:43 +02:00
RosterEntries.java Add Roster.getEntriesAndAddListener(RosterListener,RosterEntries) 2015-01-26 20:47:14 +01:00
RosterEntry.java Improve Roster API 2015-05-27 22:34:43 +02:00
RosterGroup.java Merge branch '4.1' 2015-05-27 22:50:55 +02:00
RosterListener.java Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
RosterLoadedListener.java Add RosterLoadedListener 2015-02-17 16:56:04 +01:00
SubscribeListener.java Add Roster.addSubscribeListener() 2015-05-21 22:41:21 +02:00
package-info.java Add JavadocPackage checkstyle 2015-04-04 17:16:47 +02:00