Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 19 Jul 2017 15:39:11 +0000 (16:39 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 19 Jul 2017 15:39:11 +0000 (16:39 +0100)
commitc4b90e7ff57436d6bb96d316eed24c887b241f4d
treed3adf0cdb97ad24cc9de0e4a4863183efac62ef4
parent65001ada8adff987afc0cf4ce9797b6cfde26055
parentddbcb3e33e1a8d4c644472cfa3d28b193da97064
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java
12 files changed:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/SeqCanvas.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/IdPanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java
src/jalview/viewmodel/ViewportRanges.java
test/jalview/viewmodel/ViewportRangesTest.java