git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e91b3be 0d9e7c0)
Merge branch 'develop' into improvement/JAL-4124_dont_duplacate_PAE_data_acrossviews
authorJames Procter <j.procter@dundee.ac.uk>
Mon, 23 Oct 2023 11:14:13 +0000 (12:14 +0100)
committerJames Procter <j.procter@dundee.ac.uk>
Mon, 23 Oct 2023 11:14:13 +0000 (12:14 +0100)
1  2 
src/jalview/datamodel/Alignment.java patch | diff1 | diff2 | blob | history
src/jalview/project/Jalview2XML.java patch | diff1 | diff2 | blob | history
src/jalview/renderer/ContactMapRenderer.java patch | diff1 | diff2 | blob | history
test/jalview/project/Jalview2xmlTests.java patch | diff1 | diff2 | blob | history

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