git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92ccbf5 7157280)
Merge branch 'bug/JAL-2667mouseWheelWrapped' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 25 Oct 2017 15:33:01 +0000 (16:33 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 25 Oct 2017 15:33:01 +0000 (16:33 +0100)
1  2 
src/jalview/gui/IdPanel.java patch | diff1 | diff2 | blob | history
src/jalview/gui/SeqPanel.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/IdPanel.java
Simple merge
diff --cc src/jalview/gui/SeqPanel.java
Simple merge