Florian Schmaus f5ef42ec56 Merge branch '4.2'		2017-06-02 13:51:56 +02:00
..
caps	s/processPacket/processStanza/ s/PacketCollector/StanzaCollector/	2017-01-03 11:35:04 +01:00
filetransfer	Merge pull request #106 from annovanvliet/fixBuild	2017-02-27 12:04:59 +01:00
httpfileupload	More checkstyle whitespace related checks	2017-05-24 14:42:38 +02:00
iot	Make Smack buildable under windows.	2017-02-26 18:13:10 +01:00
iqversion	Make Smack buildable under windows.	2017-02-26 18:13:10 +01:00
mam	Make sure, archiving is enabled	2017-05-29 22:32:14 +02:00
muc	Make Smack buildable under windows.	2017-02-26 18:13:10 +01:00
omemo	Add OMEMO support	2017-06-02 13:40:10 +02:00
ping	Add PingManager.pingAsync(Jid, long)	2017-05-16 15:53:03 +02:00
pubsub	Improve PubSub API	2015-05-12 17:56:06 +02:00
xdata	Merge branch '4.2'	2017-05-25 11:25:36 +02:00
package-info.java	Make Smack buildable under windows.	2017-02-26 18:13:10 +01:00