Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371colle...
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Jan 2017 09:04:18 +0000 (09:04 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Jan 2017 09:04:18 +0000 (09:04 +0000)
commit24680a271861e9309a2241c8884874656ac111b1
tree5cb6a6dcc8e64278d7e89935df85fde02fd5bed6
parent9270bd30c65a1304c4228b2f07734bc8461cd531
parenta6875ff6ca7894443c98b1d068f78ea25c5bfc87
Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371collectionColourScheme
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/SeqPanel.java