Merge branch 'Release_2_8_2_Branch' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 8 Oct 2014 11:15:45 +0000 (12:15 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 8 Oct 2014 11:15:45 +0000 (12:15 +0100)
commit8ba93f7655ea7165579539158b6a5eb076135bba
tree3376668782f5523e50ac45d920a02e92dfc1863b
parentfe6b3fb39308b5c045849db2be75ba07824be776
parent1098fd737b5ff291ea83768404036d388f43d0b8
Merge branch 'Release_2_8_2_Branch' into
features/JAL-1264_showHideAnnotations

Conflicts:
resources/lang/Messages.properties
src/jalview/datamodel/Alignment.java
resources/lang/Messages.properties
src/jalview/datamodel/Alignment.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AnnotationColourChooser.java
src/jalview/gui/Desktop.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/IdPanel.java
src/jalview/jbgui/GAlignFrame.java
test/jalview/ws/jabaws/MinJabawsClientTests.java