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 |
|
rcollier
|
1b651d4939
|
SMACK-534 Refactored all System.out/err and printStackTrace calls with appropriate Java util logging calls.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13887 b35dd754-fafc-0310-a699-88a17e54d16e
|
2014-02-02 22:39:07 +00:00 |
|
rcollier
|
dac68c64a9
|
Merge from 3.3 branch
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13663 b35dd754-fafc-0310-a699-88a17e54d16e
|
2013-05-18 16:56:52 +00:00 |
|
rcollier
|
13d87e3d40
|
SMACK-361 Changed default for filename encoding to Base 32 (which should work on all file systems) and added a Base 64 filename and url safe implementation of the StringEncoder.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13619 b35dd754-fafc-0310-a699-88a17e54d16e
|
2013-04-20 21:55:27 +00:00 |
|
Florian Schmaus
|
21be8c55ee
|
SMACK-361 Added support for Entity Capabilities.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13560 b35dd754-fafc-0310-a699-88a17e54d16e
|
2013-03-18 08:50:48 +00:00 |
|
Florian Schmaus
|
9123578ea5
|
SMACK-361 Added support for Entity Capabilities.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13558 b35dd754-fafc-0310-a699-88a17e54d16e
|
2013-03-18 08:40:35 +00:00 |
|