JAL-1807 merge from JAL-1759jmolUpdate
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 8 Jul 2015 15:19:51 +0000 (16:19 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 8 Jul 2015 15:19:51 +0000 (16:19 +0100)
commit792a03fc1994671ae23e7263cefd51c9b0da53cb
treec6a71bbf0d234f24dd1569759327c47fc75cfb2b
parente1e98ff6e24e5f26f07ab94cdd94799891662319
JAL-1807 merge from JAL-1759jmolUpdate
58 files changed:
.classpath
THIRDPARTYLIBS
appletlib/JmolApplet-12.2.4.jar [deleted file]
appletlib/JmolApplet-14.2.14_2015.06.11.jar [new file with mode: 0644]
build.xml
lib/Jmol-12.2.4.jar [deleted file]
lib/Jmol-14.2.14_2015.06.11.jar [new file with mode: 0644]
nbproject/project.properties
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AppletJmol.java
src/jalview/appletgui/AppletJmolBinding.java
src/jalview/appletgui/ExtJmol.java
src/jalview/binding/Alignment.java
src/jalview/binding/Annotation.java
src/jalview/binding/AnnotationElement.java
src/jalview/binding/Colour.java
src/jalview/binding/Feature.java
src/jalview/binding/FeatureSettings.java
src/jalview/binding/Features.java
src/jalview/binding/JGroup.java
src/jalview/binding/JSeq.java
src/jalview/binding/JalviewModel.java
src/jalview/binding/JalviewModelSequence.java
src/jalview/binding/JalviewUserColours.java
src/jalview/binding/Pdbentry.java
src/jalview/binding/PdbentryItem.java
src/jalview/binding/Pdbids.java
src/jalview/binding/Property.java
src/jalview/binding/Sequence.java
src/jalview/binding/SequenceSet.java
src/jalview/binding/SequenceType.java
src/jalview/binding/Setting.java
src/jalview/binding/Tree.java
src/jalview/binding/UserColourScheme.java
src/jalview/binding/UserColours.java
src/jalview/binding/VAMSAS.java
src/jalview/binding/VamsasModel.java
src/jalview/binding/Viewport.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/jmol/PDBFileWithJmol.java
src/jalview/gui/AppJmol.java
src/jalview/gui/AppJmolBinding.java
src/jalview/gui/AppVarnaBinding.java
src/jalview/gui/Desktop.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/ScriptWindow.java [deleted file]
src/jalview/schemabinding/version2/.castor.cdr
src/jalview/schemabinding/version2/CalcIdParam.java
src/jalview/schemabinding/version2/JGroup.java
src/jalview/schemabinding/version2/Setting.java
src/jalview/schemabinding/version2/StructureState.java
src/jalview/schemabinding/version2/Tree.java
src/jalview/schemabinding/version2/Viewport.java
src/jalview/ws/EnfinEnvision2OneWay.java [deleted file]
src/jalview/ws/jws2/JabaParamStore.java
test/MCview/PDBfileTest.java
test/jalview/analysis/AlignSeqTest.java
utils/InstallAnywhere/Jalview.iap_xml