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.

Werner Dittmann 64a459f352 Merge branch 'ingo' ... Conflicts: trunk/lib/installer-exclude/libjitsi.jar		13 years ago
.settings	Set Eclipse compiler compliance level to 1.5	14 years ago
lib	Merge branch 'ingo'	13 years ago
nbproject	Update Apache httpcore and httpclient to 4.2.3	13 years ago
resources	Renames the Options menu in MacOSX systray to Preferences to ensure conformity.	13 years ago
src	Merge branch 'ingo'	13 years ago
test	Works on preventing an issue with the display of remote video which could scale it down to a tiny number of pixels. Fixes multiple technical/programming errors, warnings, javadocs.	13 years ago
www	Tries to forward jitsi.java.net to jitsi.org	14 years ago
.classpath	Merge branch 'ingo'	13 years ago
.project	Move IDE project files to where they are expected by the respective IDE	14 years ago
build.xml	Merge branch 'ingo'	13 years ago
jitsi.iml	Adds new project files for IntelliJ Idea.	14 years ago
jitsi.ipr	Removes unused libraries in IDEA project file.	13 years ago