Merge commit '96d00473b8f48045630714aeffb9ac2e47051292' into upstream upstream/1.1.3
-rw-r--r-- 974 .classpath
-rw-r--r-- 369 .project
drwxr-xr-x - .settings
-rw-r--r-- 8276 ChangeLog
-rw-r--r-- 35972 LICENSE.TXT
-rw-r--r-- 556 README.TXT
-rw-r--r-- 2200 ReleaseNotes
-rw-r--r-- 3509 TODO
-rw-r--r-- 377 build.properties
-rw-r--r-- 6939 build.xml
-rwxr-xr-x 222 cleanup-script.sh
drwxr-xr-x - datafiles
drwxr-xr-x - doc
-rw-r--r-- 1613 fileformat.txt
drwxr-xr-x - pix-src
drwxr-xr-x - pix
-rw-r--r-- 1664 releasing.txt
-rwxr-xr-x 405 run.sh
drwxr-xr-x - src-extra
drwxr-xr-x - src
drwxr-xr-x - test