Merge branch 'upstream' into debian
-rw-r--r-- 1394 .classpath
-rw-r--r-- 369 .project
drwxr-xr-x - .settings
-rw-r--r-- 11651 ChangeLog
-rw-r--r-- 35972 LICENSE.TXT
-rw-r--r-- 705 README.TXT
-rw-r--r-- 3657 ReleaseNotes
-rw-r--r-- 3611 TODO
-rw-r--r-- 377 build.properties
-rw-r--r-- 6988 build.xml
drwxr-xr-x - datafiles-src
drwxr-xr-x - datafiles
drwxr-xr-x - debian
drwxr-xr-x - doc
-rw-r--r-- 1758 fileformat.txt
drwxr-xr-x - l10n
drwxr-xr-x - pix-src
drwxr-xr-x - pix
-rw-r--r-- 1386 releasing.txt
-rwxr-xr-x 425 run.sh
drwxr-xr-x - scripts
drwxr-xr-x - src-extra
drwxr-xr-x - src
drwxr-xr-x - test