git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67ba256 976c518)
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Jan 2017 09:03:27 +0000 (09:03 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Jan 2017 09:03:27 +0000 (09:03 +0000)
1  2 
src/jalview/datamodel/Alignment.java patch | diff1 | diff2 | blob | history
src/jalview/datamodel/AlignmentI.java patch | diff1 | diff2 | blob | history
test/jalview/datamodel/AlignmentTest.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/datamodel/Alignment.java
Simple merge
diff --cc src/jalview/datamodel/AlignmentI.java
Simple merge