git://source.jalview.org / jalview.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9dba42e b35271f)
Merge branch 'bug/JAL-2983negativeSliderMin' into releases/Release_2_11_1_Branch
authorJim Procter <jprocter@issues.jalview.org>
Mon, 27 Jul 2020 15:46:47 +0000 (16:46 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 27 Jul 2020 15:46:47 +0000 (16:46 +0100)
commit6b56f0140b759b789da51aa4ed327d43297a3a5d
treef86585c30910df17d15fd0088744fd47b2e378eatree | snapshot
parent9dba42effb39584c255d94b8154c6f4c0c62df68commit | diff
parentb35271fb7c5b9cb0a07aeefca9e2e5b5d5bdaa8dcommit | diff
Merge branch 'bug/JAL-2983negativeSliderMin' into releases/Release_2_11_1_Branch
Conflict in way transparency slider was inited - followed HEAD's pattern here.
src/jalview/gui/FeatureSettings.java diff1 | diff2 | blob | history
src/jalview/gui/FeatureTypeSettings.java diff1 | diff2 | blob | history