git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 4c132b3)
Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 17 Jan 2019 15:29:29 +0000 (15:29 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 17 Jan 2019 15:29:29 +0000 (15:29 +0000)
Conflicts:
.gitignore
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/commands/EditCommand.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/ScalePanel.java


No differences found