git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 77b160b)
Merge branch 'releases/Release_2_10_4_Branch' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 18 Apr 2018 11:41:08 +0000 (12:41 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 18 Apr 2018 11:41:08 +0000 (12:41 +0100)
Conflicts:
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
test/jalview/renderer/seqfeatures/FeatureRendererTest.java


No differences found