Merge branch 'JAL-980_jmol_patch' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 4 Nov 2011 16:09:09 +0000 (16:09 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 4 Nov 2011 16:09:09 +0000 (16:09 +0000)
commit88ba474b631ee8844b2212cf0ef1bff6a97ec7e1
tree736851b4b33a86b745baf6b93e454240ed4a2d1f
parentd5148a0730ec677bc3d3849d92fe62844a6e222e
parent0e1692ebb479ee94f412079c50be4e0222bd1776
Merge branch 'JAL-980_jmol_patch' into develop

Conflicts:
.classpath
examples/appletParameters.html
.classpath
build.xml
examples/appletParameters.html
examples/applets.html
src/jalview/appletgui/AppletJmolBinding.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/gui/AppJmolBinding.java