git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1af485 1497b61)
Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 17 Apr 2019 10:48:28 +0000 (11:48 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 17 Apr 2019 10:48:28 +0000 (11:48 +0100)
1  2 
src/jalview/gui/ScalePanel.java patch | diff1 | diff2 | blob | history
src/jalview/ws/SequenceFetcher.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/ScalePanel.java
Simple merge
diff --cc src/jalview/ws/SequenceFetcher.java
Simple merge