git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ba45c6 f6d1305)
Merge branch 'feature/JAL-4315_fc_draganddrop' into develop
authorJames Procter <j.procter@dundee.ac.uk>
Wed, 1 Nov 2023 19:16:55 +0000 (19:16 +0000)
committerJames Procter <j.procter@dundee.ac.uk>
Wed, 1 Nov 2023 19:16:55 +0000 (19:16 +0000)
1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/FeatureSettings.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/FeatureSettings.java
Simple merge