Merge branch 'JAL-1422_srs' into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 13 Jan 2014 14:05:51 +0000 (14:05 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 13 Jan 2014 14:05:51 +0000 (14:05 +0000)
commitfe76692596c7d98452e2c93bcd934cb8c0dbf5b5
treef696e5edef8667eb1c4136fad11d67c213f4f70b
parent17d3ea2201aefcedab0ed6513cbd420f87f8b999
parent12045b681611d64529bdaf35f05d8cb0d9a2b054
Merge branch 'JAL-1422_srs' into Release_2_8_Branch

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