git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78b7c57 fa8a0ce)
Merge branch 'develop' into features/JAL-2909_bamImport_2_11_2
authorJim Procter <j.procter@dundee.ac.uk>
Fri, 1 Oct 2021 16:45:01 +0000 (17:45 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Fri, 1 Oct 2021 16:45:01 +0000 (17:45 +0100)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
src/jalview/io/FileFormat.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc src/jalview/io/FileFormat.java
Simple merge