git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24680a2 dfd0210)
Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371colle...
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Jan 2017 14:11:24 +0000 (14:11 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Jan 2017 14:11:24 +0000 (14:11 +0000)
1  2 
src/jalview/io/AnnotationFile.java patch | diff1 | diff2 | blob | history
src/jalview/schemes/ColourSchemeI.java patch | diff1 | diff2 | blob | history
src/jalview/schemes/ResidueColourScheme.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/io/AnnotationFile.java
Simple merge