JAL-2909 mininal merge of bam import demo to Jalview 2.11.2 develop
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 30 Sep 2021 08:18:53 +0000 (09:18 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 30 Sep 2021 08:21:49 +0000 (09:21 +0100)
commitd4a6a8430fa8d954b0fc5ecdcc6a7bda424224ad
tree4e24b22eb518267debb6584a3096ae990cfdb792
parentd80fbc33dfc7ece325c896b33c3296a075e48a30
parent70f98ab214fefd664892e8c8ec44811d820a802d
JAL-2909 mininal merge of bam import demo to Jalview 2.11.2 develop
Merge remote-tracking branch 'origin/features/JAL-2909_bamImport2_11' into features/JAL-2909_bamImport_2_11_2

 Conflicts:
src/jalview/io/AlignmentFileReaderI.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/FileFormat.java
src/jalview/io/FileLoader.java
resources/lang/Messages.properties
src/jalview/io/AlignFile.java
src/jalview/io/AlignmentFileReaderI.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/FileFormat.java
src/jalview/io/FileLoader.java
src/jalview/io/FileParse.java
src/jalview/io/FormatAdapter.java
src/jalview/io/IdentifyFile.java
utils/checkstyle/import-control.xml