Merge branch 'releases/Release_2_11_4_Branch'
[jalview.git] / core / .settings / org.eclipse.jdt.core.prefs