Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Jun 2017 14:36:41 +0000 (15:36 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Jun 2017 14:36:41 +0000 (15:36 +0100)
commite4f893546d61b043b3381c9548f0cfbf7084fd78
treef53a24c4fef3ff7e1107e9d63c21309e3b55afc7
parent4cb8a2457311f8f01339eb80430a09b702c8fd62
parent864558097ceffef983b15f24598cfdaf20efd52d
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
test/jalview/ext/jmol/JmolParserTest.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/SeqPanel.java
test/jalview/ext/jmol/JmolParserTest.java