Florian Schmaus 81002c4fbd Merge branch '4.2'		2017-11-22 08:37:47 +01:00
..
demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo	Add more checkstyle tests	2015-03-17 22:02:44 +01:00
integration-test	s/processPacket/processStanza/ s/PacketCollector/StanzaCollector/	2017-01-03 11:35:04 +01:00
main/java/org/jivesoftware/smackx	Merge branch '4.2'	2017-11-22 08:37:47 +01:00