Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 20 Jan 2017 11:56:07 +0000 (11:56 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 20 Jan 2017 11:56:07 +0000 (11:56 +0000)
commit78ca38e25791832308bf179d91a41c352d305f4c
tree1dc0695bc2c7495bb36e93fd4b8cbd6ad7944f56
parent06ce849ffedc7ab10a3c54cda96b9a7dec58c136
parent76caf07872d92bdc21faaa9278d9cccd7609d9b8
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability

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