Merge branch 'JAL-1422_srs' into JAL-1422_srs_r281
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 13 Jan 2014 14:09:34 +0000 (14:09 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 13 Jan 2014 14:09:34 +0000 (14:09 +0000)
commit18254310f30a2f4d39a4110228e61f05953021cb
treeb2919288448f37f9392e2f03489ea15151143685
parent682b4b598105a0024231bcf5f53206530425fd64
parent12045b681611d64529bdaf35f05d8cb0d9a2b054
Merge branch 'JAL-1422_srs' into JAL-1422_srs_r281

Conflicts:
examples/linkedapplets_ng.html
examples/appletParameters.html
examples/applets.html
examples/embedded.html
examples/embeddedWJmol.html
examples/linkedapplets_ng.html
src/jalview/gui/Preferences.java