Merge branch 'merge/JAL-3609_and_JAL-3608' into releases/Release_2_11_1_Branch
[jalview.git] / src / jalview / controller /
drwxr-xr-x   ..
-rw-r--r-- 14512 AlignViewController.java
-rw-r--r-- 1175 FeatureSettingsController.java
-rw-r--r-- 1212 FeatureSettingsControllerGuiI.java