f8274dda53
Merge branch smack_3_3_2 and trunk
...
as the state of the both branches of Smack's SVN repository
http://fisheye.igniterealtime.org/browse/smack on 2013-12-30.
Conflicts:
documentation/extensions/caps.html
source/org/jivesoftware/smack/PacketReader.java
source/org/jivesoftware/smack/SmackConfiguration.java
source/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
2013-12-30 01:29:55 +01:00
0e6817dc4f
SMACK-361 Minor EntityCapsManager fixes
...
Don't use the constructor in ConnectionCreationListener to prevent
duplicate instances for the same connection. Fixed EntityCaps
documentation.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13799 b35dd754-fafc-0310-a699-88a17e54d16e
2013-11-03 21:49:39 +00:00
5f793d4f44
SMACK-431 Reworded Entity Caps documentation, added missing frame link
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13782 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-22 14:43:13 +00:00
c2d057f4b2
SMACK-431 Reworded Entity Caps documentation, added missing frame link
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13692 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-24 21:27:43 +00:00
cb5e1dc94b
SMACK-431 Entity Capabilities are now enabled as default for new connections. Added an extensions documentation html page.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13689 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-22 17:01:58 +00:00
c7d468697f
SMACK-431 Entity Capabilities are now enabled as default for new connections. Added an extensions documentation html page.
...
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13686 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-22 17:00:40 +00:00
Florian Schmaus