git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1984b1 1e591b1)
Merge branch 'develop' into update/JAL-3949_abstracted_logging_for_jalviewjs_and_sanity
authorBen Soares <b.soares@dundee.ac.uk>
Fri, 11 Feb 2022 03:35:57 +0000 (03:35 +0000)
committerBen Soares <b.soares@dundee.ac.uk>
Fri, 11 Feb 2022 03:35:57 +0000 (03:35 +0000)
1  2 
src/jalview/io/EMBLLikeFlatFile.java patch | diff1 | diff2 | blob | history
src/jalview/util/MappingUtils.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/io/EMBLLikeFlatFile.java
Simple merge
diff --cc src/jalview/util/MappingUtils.java
Simple merge