git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65c62e3 7ef3d2f)
Merge branch 'develop' into features/mchmmer
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 20 Mar 2018 08:23:32 +0000 (08:23 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 20 Mar 2018 08:23:32 +0000 (08:23 +0000)
1  2 
src/jalview/bin/Cache.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Preferences.java patch | diff1 | diff2 | blob | history
test/jalview/datamodel/AlignmentTest.java patch | diff1 | diff2 | blob | history

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