git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e850d8c 5b7c673)
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 24 Oct 2017 08:17:45 +0000 (09:17 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 24 Oct 2017 08:17:45 +0000 (09:17 +0100)
1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/TreePanel.java patch | diff1 | diff2 | blob | history

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