Merge branch 'features/JAL-2360colourSchemeApplicability' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 20 Jan 2017 12:21:42 +0000 (12:21 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 20 Jan 2017 12:21:42 +0000 (12:21 +0000)
commitfd7eebe6dcf2346692d718ef91bb468cc12ebf44
tree218d6d0411298a453e8bd7f8529c001ab281cb8a
parente94dbf72fe43a100b938e9ca60b9b1b1508a521f
parent5abd8cc59e692171861a337e189faaa26dcfff16
Merge branch 'features/JAL-2360colourSchemeApplicability' into
features/JAL-2371collectionColourScheme

Conflicts:
src/jalview/appletgui/SliderPanel.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/SliderPanel.java
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/SliderPanel.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SliderPanel.java