git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c5e457 ad6e0dc)
Merge branch 'bug/JAL-3412idWidthDiscrepancy' into develop bug/JAL-3412idWidthDiscrepancy
authorJim Procter <jprocter@issues.jalview.org>
Thu, 27 Feb 2020 15:56:49 +0000 (15:56 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 27 Feb 2020 15:56:49 +0000 (15:56 +0000)
1  2 
src/jalview/gui/AlignViewport.java patch | diff1 | diff2 | blob | history
src/jalview/gui/SplitFrame.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/AlignViewport.java
Simple merge
diff --cc src/jalview/gui/SplitFrame.java
Simple merge