git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 4f30214)
Merge branch 'develop' into feature/JAL-3551Pymol
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 19 May 2020 16:27:32 +0000 (17:27 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 19 May 2020 16:27:32 +0000 (17:27 +0100)
Conflicts:
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/jmol/JmolCommands.java
src/jalview/gui/AppJmol.java
src/jalview/gui/AppJmolBinding.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/StructureViewerBase.java
src/jalview/jbgui/GPreferences.java
src/jalview/jbgui/GStructureViewer.java
src/jalview/project/Jalview2XML.java


No differences found