Merge branch 'features/JAL-2177_update_jmol_to_14.6.4_2016.10.26' into develop
[jalview.git] / .settings /
drwxr-xr-x   ..
-rw-r--r-- 24446 org.eclipse.jdt.core.prefs
-rw-r--r-- 3160 org.eclipse.jdt.ui.prefs