git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c8a259 1cb8662)
Merge remote-tracking branch 'origin/tasks/JAL-3035_remove_dasobert_dependency' into...
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 4 Mar 2019 11:47:14 +0000 (11:47 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 4 Mar 2019 11:47:14 +0000 (11:47 +0000)
1  2 
src/jalview/bin/Cache.java patch | diff1 | diff2 | blob | history
src/jalview/gui/FeatureSettings.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/bin/Cache.java
Simple merge
diff --cc src/jalview/gui/FeatureSettings.java
Simple merge