Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 15 May 2017 10:59:29 +0000 (11:59 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 15 May 2017 10:59:29 +0000 (11:59 +0100)
commit90029b4b40d8fcc9abed4567b11031e52cd74a2b
treed77272012a8fc386a5f89a8af363350d4807991a
parenta18b80e001441bc075c209fc1a757a9aa9fea0a5
parent04d19d44b27b66c342e35b8933776b0ca7da9f35
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/gui/OverviewPanel.java
src/jalview/appletgui/SeqPanel.java
src/jalview/io/JSONFile.java