Merge branch 'develop' into Release_2_9_0b1_Branch
authorJim Procter <jprocter@issues.jalview.org>
Mon, 5 Oct 2015 12:03:44 +0000 (13:03 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 5 Oct 2015 12:03:44 +0000 (13:03 +0100)
commitdc1ad37588e94cbc9ebbfaab2e9e49407f464310
tree3e17d0937f88863f05e3f02c48ffefb569c44bde
parent26ce1755b5ec689580d683184f7e2d921143a0ba
parent3ee1b42bc43d39be3978078ac8c6529649665097
Merge branch 'develop' into Release_2_9_0b1_Branch
JAL-1894 update release branch from develop
29 files changed:
examples/appletParameters.html
examples/applets.html
examples/exampleFeatures.txt
help/html/features/columnFilterByAnnotation.html
help/html/releases.html
src/jalview/api/ComplexAlignFile.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AlignViewport.java
src/jalview/appletgui/CutAndPasteTransfer.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AppJmol.java
src/jalview/gui/CutAndPasteTransfer.java
src/jalview/gui/Desktop.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/SeqPanel.java
src/jalview/gui/SplitFrame.java
src/jalview/io/FeaturesFile.java
src/jalview/io/FileLoader.java
src/jalview/io/HtmlFile.java
src/jalview/io/HtmlSvgOutput.java
src/jalview/io/IdentifyFile.java
src/jalview/io/JSONFile.java
src/jalview/jbgui/GSplitFrame.java
src/jalview/util/ParseHtmlBodyAndLinks.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
src/jalview/ws/jws1/SeqSearchWSThread.java
test/jalview/io/JSONFileTest.java
test/jalview/ws/dbsources/PDBRestClientTest.java