FishEye: Diff - jalview/gradle.properties

Tree
Options

8a43b83

Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure
Conflicts:
gradle.properties
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/api/structures/JalviewStructureDisplayI.java
src/jalview/appletgui/AppletJmol.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/jmol/JmolCommands.java
src/jalview/ext/rbvi/chimera/AtomSpecModel.java
src/jalview/ext/rbvi/chimera/ChimeraCommands.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AppJmol.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/JalviewChimeraBindingModel.java
src/jalview/gui/StructureViewerBase.java
src/jalview/structures/models/AAStructureBindingModel.java
test/jalview/ext/jmol/JmolCommandsTest.java
test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
test/jalview/structures/models/AAStructureBindingModelTest.java

08 Jun 20 gmungoc <g.m.carstairs@dundee.ac.uk> 8a43b8353b89a47002ef17c959ed61281fc4d826

316d7fc

JAL-3225 Removed dependency on command line pandoc to convert .md files to .html. Now all files in doc/*.md will get converted to doc/*.html using flexmark within gradle process.

04 Jun 20 Ben Soares 316d7fc8af1d26b1c7e7e99341648bc01699ac1e

Loading ...