Merge branch 'develop' into trial_merge/JAL-1950
[jalview.git] / .settings /
drwxr-xr-x   ..
-rw-r--r-- 24446 org.eclipse.jdt.core.prefs
-rw-r--r-- 3160 org.eclipse.jdt.ui.prefs