You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

scmerger fba5784542 Merge branch '1.0-local' into trunk-local ... * 1.0-local: Disables serialization warnigs. Increases number of allowed warnings so that we can track the total number as it decreases. Adds class javadocs. Problem reported by Linus		17 years ago
doc	removed .cvsignore-files as they are no longer needed [we are using subversion nowadays]	19 years ago
ide	Include latest version of ZRTP4J. Modify the Eclipse and NB project files. Use a generic name	17 years ago
lib	Add filetransfer for yahoo and generic filetransfer tests - enabled for jabber and yahoo.	17 years ago
resources	Fix progress string on file transfer progress bar.	17 years ago
src	Merge branch '1.0-local' into trunk-local	17 years ago
test	Disable test by not adding it in test suite.	17 years ago
www	Updating stat tracker for java.net pages. All resulting builds would have no real modifications	18 years ago
build.xml	Merge branch '1.0-local' into trunk-local	17 years ago