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)
commit808d16ee89f7aaf14a1327a5f830822244b995e0
treefd62e9672983ba58070673e2a4c262b4727c231d
parent65c62e3f2a1ec1a63b0fc58fdfaf249da27c2371
parent7ef3d2f322e86a39a4cf8df7793b434a4d028488
Merge branch 'develop' into features/mchmmer
src/jalview/bin/Cache.java
src/jalview/gui/Preferences.java
test/jalview/datamodel/AlignmentTest.java