Merge branch 'releases/Release_2_10_Branch' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 11 Oct 2016 08:37:28 +0000 (09:37 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 11 Oct 2016 08:37:28 +0000 (09:37 +0100)
1  2 
src/jalview/ext/jmol/JmolParser.java

Simple merge