git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e207348 4a0a4a0)
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)
1  2 
src/jalview/appletgui/AppletJmolBinding.java patch | diff1 | diff2 | blob | history
src/jalview/appletgui/ExtJmol.java patch | diff1 | diff2 | blob | history
src/jalview/ext/jmol/JalviewJmolBinding.java patch | diff1 | diff2 | blob | history
test/jalview/io/cache/JvCacheableInputBoxTest.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/appletgui/ExtJmol.java
Simple merge