Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/caps
Florian Schmaus 01f08e87c2 Merge branch '4.1'
Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
	version.gradle
2015-05-24 22:36:11 +02:00
..
cache Add JavadocPackage checkstyle 2015-04-04 17:16:47 +02:00
packet Add JavadocPackage checkstyle 2015-04-04 17:16:47 +02:00
provider Smack 4.1.1 2015-05-09 15:42:09 +02:00
CapsVersionAndHash.java Introduce CapsVersionAndHash 2014-12-03 13:01:13 +01:00
EntityCapsManager.java Merge branch '4.1' 2015-05-24 22:36:11 +02:00
package-info.java Add JavadocPackage checkstyle 2015-04-04 17:16:47 +02:00