Merge branch 'Release_2_8_Branch' into WIP_fix_JAL-1423 WIP_fix_JAL-1423
authorJalview build Manager <jalview-dev@jalview.org>
Mon, 13 Jan 2014 18:15:53 +0000 (18:15 +0000)
committerJalview build Manager <jalview-dev@jalview.org>
Mon, 13 Jan 2014 18:15:53 +0000 (18:15 +0000)
commit1ac48a3ee02288fe52f16f9637bbaa099594fe4b
tree6e78030adcf71c0a81e17e23586a0e760f3065c7
parent9307d91822245dc9fb2dc741410e3a2658aa6a7a
parentfe76692596c7d98452e2c93bcd934cb8c0dbf5b5
Merge branch 'Release_2_8_Branch' into WIP_fix_JAL-1423

Conflicts:
examples/linkedapplets_ng.html
examples/applets.html
examples/embedded.html
examples/embeddedWJmol.html
examples/linkedapplets_ng.html