git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 124d522 974da94)
Merge branch 'develop' of https://source.jalview.org/git/jalview.git
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Thu, 26 Oct 2017 20:36:34 +0000 (21:36 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Thu, 26 Oct 2017 20:36:34 +0000 (21:36 +0100)
into kjvdh/features/PhylogenyViewer

Conflicts:
src/jalview/gui/TreePanel.java

1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/io/FileLoader.java patch | diff1 | diff2 | blob | history
src/jalview/javascript/JSFunctionExec.java patch | diff1 | diff2 | blob | history

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