git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e484317 429bbda)
Merge branch 'feature/JAL-2909bamfiles_features' into features/JAL-2909_bamImport2_11
authorJim Procter <jprocter@issues.jalview.org>
Wed, 21 Mar 2018 16:43:47 +0000 (16:43 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 21 Mar 2018 16:43:47 +0000 (16:43 +0000)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
src/jalview/io/FormatAdapter.java patch | diff1 | diff2 | blob | history

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