merge commit
-rw-r--r-- 3698 .classpath
-rw-r--r-- 1054 .cvsignore
drwxr-xr-x - .externalToolBuilders
-rw-r--r-- 379 .gitattributes
-rw-r--r-- 142 .gitignore
-rw-r--r-- 1155 .project
drwxr-xr-x - .settings
-rw-r--r-- 766 AUTHORS
-rw-r--r-- 876 FEATURETODO
-rwxr-xr-x 4662 JalviewApplet.jpx
-rwxr-xr-x 3249 JalviewX.jpx
-rwxr-xr-x 32472 LICENSE
-rwxr-xr-x 1358 README
-rw-r--r-- 59 RELEASE
-rw-r--r-- 2248 THIRDPARTYLIBS
drwxr-xr-x - appletlib
-rwxr-xr-x 33007 build.xml
drwxr-xr-x - dist
drwxr-xr-x - doc
drwxr-xr-x - examples-jbake
drwxr-xr-x - examples
drwxr-xr-x - help
-rwxr-xr-x 15403 jalview-jalopy.xml
drwxr-xr-x - lib
-rw-r--r-- 4749 nbbuild.xml
drwxr-xr-x - nbproject
drwxr-xr-x - resources
drwxr-xr-x - schemas
drwxr-xr-x - src
drwxr-xr-x - test
drwxr-xr-x - utils