Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/disco
Florian Schmaus 369878b6d9 Merge branch '4.1'
Conflicts:
	version.gradle
2015-03-11 20:51:08 +01:00
..
packet Merge branch '4.1' 2015-03-11 20:51:08 +01:00
provider Merge branch '4.1' 2015-03-04 22:42:36 +01:00
AbstractNodeInformationProvider.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
NodeInformationProvider.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
ServiceDiscoveryManager.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00