1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-16 08:34:50 +02:00
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/caps
Florian Schmaus 83b84c5bd3 Merge branch '4.1'
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
2015-03-24 17:16:18 +01:00
..
cache Merge branch '4.1' 2015-03-24 17:16:18 +01:00
packet Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
provider Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
CapsVersionAndHash.java Introduce CapsVersionAndHash 2014-12-03 13:01:13 +01:00
EntityCapsManager.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00