git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: b419d3b)
Merge branch 'develop' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 May 2019 13:00:38 +0000 (14:00 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 May 2019 13:00:38 +0000 (14:00 +0100)
Conflicts:
src/jalview/gui/FeatureTypeSettings.java
src/jalview/io/BackupFiles.java
src/jalview/jbgui/GPreferences.java


No differences found