Merge branch 'features/JAL-2360colourSchemeApplicability' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 20 Jan 2017 14:44:02 +0000 (14:44 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 20 Jan 2017 14:44:02 +0000 (14:44 +0000)
commitc63c9f4011573ca0e65befe9633a9380a829527b
tree26cb5e492fdd4bd4da7a748ab57ff1d97feae1e0
parentfd7eebe6dcf2346692d718ef91bb468cc12ebf44
parentf503ff958849fba3bcb3ae1c6c3ef1a70cff450e
Merge branch 'features/JAL-2360colourSchemeApplicability' into
features/JAL-2371collectionColourScheme

Conflicts:
src/jalview/appletgui/SliderPanel.java
src/jalview/gui/SliderPanel.java
src/jalview/appletgui/SliderPanel.java
src/jalview/gui/SeqPanel.java
src/jalview/gui/SliderPanel.java