Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
[jalview.git] / .settings /
drwxr-xr-x   ..
-rw-r--r-- 54 org.eclipse.buildship.core.prefs