Merge branch 'develop' into Release_2_9_0b1_Branch
authorJim Procter <jprocter@issues.jalview.org>
Thu, 8 Oct 2015 11:09:47 +0000 (12:09 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 8 Oct 2015 11:09:47 +0000 (12:09 +0100)
commit57dd16688caa6dacaeaf465bab3ee8b6126e1a51
treedf7a9712c74d4339bde20a85eb7663d8fdd12357
parentdc1ad37588e94cbc9ebbfaab2e9e49407f464310
parenta875782b000ff363877677507b7512f8a6c70875
Merge branch 'develop' into Release_2_9_0b1_Branch
23 files changed:
help/html/features/groovy.html
help/html/releases.html
help/html/whatsNew.html
src/jalview/analysis/AlignmentUtils.java
src/jalview/appletgui/AlignFrame.java
src/jalview/bin/Jalview.java
src/jalview/bin/JalviewLite.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/datamodel/Mapping.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java
src/jalview/io/BioJsHTMLOutput.java
src/jalview/io/FeaturesFile.java
src/jalview/io/JSONFile.java
src/jalview/javascript/MouseOverStructureListener.java
src/jalview/json/binding/biojson/v1/AlignmentAnnotationPojo.java
src/jalview/json/binding/biojson/v1/AnnotationPojo.java
src/jalview/schemes/UserColourScheme.java
src/jalview/ws/DBRefFetcher.java
src/jalview/ws/uimodel/AlignAnalysisUIText.java
test/jalview/analysis/ParsePropertiesTest.java
test/jalview/io/JSONFileTest.java
test/jalview/util/MappingUtilsTest.java