Merge commit 'afc42f9336add2d5bc7d8c6504eac6e9ab362b02' into upstream upstream/1.1.4
-rw-r--r-- 1394 .classpath
-rw-r--r-- 369 .project
drwxr-xr-x - .settings
-rw-r--r-- 9141 ChangeLog
-rw-r--r-- 35972 LICENSE.TXT
-rw-r--r-- 556 README.TXT
-rw-r--r-- 2332 ReleaseNotes
-rw-r--r-- 3611 TODO
-rw-r--r-- 377 build.properties
-rw-r--r-- 6918 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 - l10n
drwxr-xr-x - lib-test
drwxr-xr-x - lib
drwxr-xr-x - pix-src
drwxr-xr-x - pix
-rw-r--r-- 1664 releasing.txt
-rwxr-xr-x 425 run.sh
drwxr-xr-x - src-extra
drwxr-xr-x - src
drwxr-xr-x - test