Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Code Issues Releases Wiki Activity
No description
1582 commits 8 branches 0 tags 34 MiB
Java 98.7%
HTML 1.2%
Find a file
Florian Schmaus 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
build Versioning updates for new release. 2013-10-07 02:42:12 +00:00
documentation Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00
jingle/extension SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software. 2013-04-07 19:15:32 +00:00
sample Fixed smack sample for updated API 2009-09-03 08:42:07 +00:00
source Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00
test Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00
test-unit/org/jivesoftware Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00
Makefile Makefile: added javadoc target 2013-02-14 00:00:02 +00:00