Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Dec 2018 13:26:46 +0000 (13:26 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Dec 2018 13:26:46 +0000 (13:26 +0000)
commit1fcc59559aec3e57268d4175f9ff3dbf9a3e16e5
treea7f5c2ee6504639254c8f20bb09efe356432671b
parente207348a53bcdda0dac93c574bf3ca1be1241929
parent4a0a4a012676c3ebee341d667eab07ea60c5770e
Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB
src/jalview/appletgui/AppletJmolBinding.java
src/jalview/appletgui/ExtJmol.java
src/jalview/ext/jmol/JalviewJmolBinding.java
test/jalview/io/cache/JvCacheableInputBoxTest.java