Merge branch 'develop' into releases/Release_2_11_Branch
authorJim Procter <jprocter@issues.jalview.org>
Tue, 11 Sep 2018 12:29:37 +0000 (13:29 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 11 Sep 2018 12:29:37 +0000 (13:29 +0100)
commit20a4d7ddb86ee996f2b6617a0470922b83354c35
treeb74e17bf77970837594fe0c45cf2bd7f4831cbb6
parent5610d0f46a76d4269d25148d42f92d867fa1061a
parentb25aadc2789b8c3ffb74d2ab20a6be6bb1597e7f
Merge branch 'develop' into releases/Release_2_11_Branch
JAL-3091 bring 2.11 onto release 2.10.5 to simplify merge
.classpath
THIRDPARTYLIBS
build.xml
help/html/releases.html
src/jalview/bin/Jalview.java
src/jalview/datamodel/SequenceFeature.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AquaInternalFrameManager.java
src/jalview/gui/Desktop.java
test/jalview/gui/SeqCanvasTest.java