Merge branch 'features/JAL-3010ontologyFeatureSettings' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 12 Feb 2019 11:28:07 +0000 (11:28 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 12 Feb 2019 11:28:07 +0000 (11:28 +0000)
commit4de7ee98ddea4e7aa9fbe71da003adb8bc19136a
treecbcf7535e4e88fae21d07850a357ab7bbf9aa11a
parent011b6facdd2bc4e179d95833613a39d0778b5681
parent58d01bd17f04745e37f69f947a41432fb9e3ec15
Merge branch 'features/JAL-3010ontologyFeatureSettings' into
merge/JAL-3187_JAL-3010

Conflicts:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/CrossRefAction.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
test/jalview/gui/AlignFrameTest.java