Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 26 Jan 2017 11:34:04 +0000 (11:34 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 26 Jan 2017 11:34:04 +0000 (11:34 +0000)
commit89911f9bb8cd7c981cbeefb0445af265fc2b0d0b
tree8a8abc88317e1b960d3ab25c46c46700570ae8ff
parent7d6bf4ac01167499c0f4e07de63edcdd72a6d595
parentc8b35bed08a4bd8688b762bd50f13195c1cfb1c6
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability

Conflicts:
src/jalview/gui/UserDefinedColours.java
src/jalview/gui/UserDefinedColours.java