Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 20 Jan 2017 09:47:20 +0000 (09:47 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 20 Jan 2017 09:47:20 +0000 (09:47 +0000)
commit06ce849ffedc7ab10a3c54cda96b9a7dec58c136
treedaa8dfa082494ff32740c14e55d86c4a6da03e28
parentca0a70b02a67f842a195319414d241ffa336656b
parent7dc7fb2a35c435d825bc91c5ae60ec6073419a69
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability

Conflicts:
src/jalview/appletgui/APopupMenu.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/PopupMenu.java
src/jalview/jbgui/GAlignFrame.java
resources/lang/Messages.properties
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/SliderPanel.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SliderPanel.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/util/ParseHtmlBodyAndLinks.java