Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 30 May 2017 15:32:36 +0000 (16:32 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 30 May 2017 15:32:36 +0000 (16:32 +0100)
commit5f3cd06105c207686e3637f40a04146076a73c87
tree8156dc61344ec3f9535004ee6349cf97367564cf
parentb94e9d2b3e667c6925e3e40bac63de219fc717a7
parentfe654aee9b43fb9c9307830c277f1e63576826ae
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/FeatureRenderer.java
src/jalview/appletgui/Finder.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/SeqPanel.java
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/FeatureRenderer.java
src/jalview/appletgui/Finder.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/SeqPanel.java