1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-23 02:58:00 +01:00
Smack/source/org/jivesoftware/smackx/entitycaps
Florian Schmaus b18a43920a Merge branch '3.4.0' into master
Conflicts:
	source/org/jivesoftware/smack/SmackConfiguration.java
2014-02-03 12:58:55 +01:00
..
cache Merge branch '3.4.0' into master 2014-02-03 12:58:55 +01:00
packet SMACK-361 Added support for Entity Capabilities. 2013-03-18 08:50:48 +00:00
provider SMACK-361 Some general code cleanup added some missing hashcode methods and added back some removed public API methods (marked as deprecated). 2013-03-31 14:24:50 +00:00
EntityCapsManager.java Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00