From: Jim Procter Date: Wed, 5 Oct 2016 16:56:17 +0000 (+0100) Subject: Merge branch 'develop' into releases/Release_2_10_Branch X-Git-Tag: Release_2_10_0~9^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=469c8fbe09f4e4c137f6255428116158bec823ac;hp=a9a8a71c1682f639552e9954e565042847513195;p=jalview.git Merge branch 'develop' into releases/Release_2_10_Branch --- diff --git a/examples/biojson-doc/index.html b/examples/biojson-doc/index.html index ba607f4..e0e5741 100755 --- a/examples/biojson-doc/index.html +++ b/examples/biojson-doc/index.html @@ -1,4 +1,24 @@ + BioJSON Format Documentation @@ -358,4 +378,4 @@ This page describes the data available in BioJSON format, the main content secti - \ No newline at end of file + diff --git a/examples/biojson-doc/tests/test.html b/examples/biojson-doc/tests/test.html index 2cbbd50..c6bebd6 100755 --- a/examples/biojson-doc/tests/test.html +++ b/examples/biojson-doc/tests/test.html @@ -1,3 +1,23 @@ + diff --git a/examples/embeddedWJmol.html b/examples/embeddedWJmol.html index 1ecff58..501c20e 100644 --- a/examples/embeddedWJmol.html +++ b/examples/embeddedWJmol.html @@ -1,5 +1,25 @@ -. + * The Jalview Authors are detailed in the 'AUTHORS' file. + --> + +
BioJS viewer
diff --git a/examples/index.html b/examples/index.html index 46df4eb..37edb8e 100644 --- a/examples/index.html +++ b/examples/index.html @@ -1,5 +1,25 @@ -. + * The Jalview Authors are detailed in the 'AUTHORS' file. + --> + +