Smack/smack-extensions/src/main/java/org/jivesoftware/smackx
Florian Schmaus 3e18a23e47 Merge branch '4.0'
Conflicts:
	build.gradle
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
2014-06-07 12:24:51 +02:00
..
address Merge branch '4.0' 2014-06-07 12:24:51 +02:00
amp Use jxmpp-core (0.1.0-alpha1-SNAPSHOT) 2014-06-01 12:24:30 +02:00
attention/packet Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
bookmarks Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
bytestreams Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
caps Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
chatstates Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
commands Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
delay Use jxmpp-core (0.1.0-alpha1-SNAPSHOT) 2014-06-01 12:24:30 +02:00
disco Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
filetransfer Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
forward Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
iqlast Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
iqprivate Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
iqversion Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
jiveproperties Extend JivePropertiesManager 2014-04-28 20:23:26 +02:00
muc Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
nick/packet Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
offline Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
pep Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
ping Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
privacy Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
pubsub Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
receipts Make XMPPConnection an interface 2014-05-28 08:18:41 +02:00
search Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
sharedgroups Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
shim Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
si Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
time Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
vcardtemp Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
xdata Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
xevent Refactor Message Event (XEP-22) code to current design 2014-05-29 21:04:56 +02:00
xhtmlim Make XMPPConnection an interface 2014-05-28 08:18:41 +02:00