merge
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 19 Sep 2016 10:30:00 +0000 (11:30 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 19 Sep 2016 10:30:00 +0000 (11:30 +0100)
commit7ab8e08c405e980cbc347ce0d694ee1ad2320e40
treef04e2e20b777d2c75cfa81f543594dc9e185dcaa
parent25b70f43fa1d2f14b566c0051fa639429e56fcaf
parente5ab72e3852d73fc2a7c67ca596b0e49e5b6c69c
merge
test/jalview/ext/jmol/JmolParserTest.java
test/jalview/io/AnnotatedPDBFileInputTest.java