Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 19 Sep 2018 14:26:17 +0000 (15:26 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 19 Sep 2018 14:26:17 +0000 (15:26 +0100)
commit19273dc7a1f9695ded523b670362e0cab31958fb
tree719e56c5e0269cb69ecb11ebbeab920825cffb1f
parent8d0fa9c19c85436ff158258581d9aed0986132c8
parent790ae3a67afce3779c0a064efb7814df2dffb7c0
Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings

Conflicts:
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/gui/SequenceFetcher.java