git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 775e7bc e080913)
Merge branch 'feature/JAL-3187linkedFeatures' into feature/JAL-3251biotypedMappings
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 7 Jun 2019 08:38:07 +0000 (09:38 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 7 Jun 2019 08:38:07 +0000 (09:38 +0100)
1  2 
src/jalview/datamodel/Alignment.java patch | diff1 | diff2 | blob | history
test/jalview/analysis/CrossRefTest.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