Merge branch 'features/JAL-2360colourSchemeApplicability' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 5 Jan 2017 13:45:13 +0000 (13:45 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 5 Jan 2017 13:45:13 +0000 (13:45 +0000)
commite23c8a1df90ccbb262f477a1b6c4b49808da80ff
treea8ca4cc659312dc2d3d2cbc045ada5e94a53b25d
parent902a15eeb7361608e4b0b8b421a5435d21b1ee63
parent67ba2560892f47d848754a97c7a809c7b8f8b3fb
Merge branch 'features/JAL-2360colourSchemeApplicability' into
features/JAL-2371collectionColourScheme

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