Merge branch 'features/JAL-1588saveChimeraSession' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 26 Jan 2015 16:45:29 +0000 (16:45 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 26 Jan 2015 16:45:29 +0000 (16:45 +0000)
commitc0aaf84826ff25d510846bd1099e10809c4df711
tree16e0cade442ea8f40358e4dbb229de385013ec12
parent616890cfe05fa81f90835e426ff7b6207f05b64b
parent31f1b88951cc5ff3aea7ae0bc1a9d8fbdd264ea3
Merge branch 'features/JAL-1588saveChimeraSession' into develop
12 files changed:
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AppletJmol.java
src/jalview/appletgui/AppletJmolBinding.java
src/jalview/appletgui/ExtJmol.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AppJmol.java
src/jalview/gui/AppJmolBinding.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/JalviewChimeraBindingModel.java
test/jalview/ws/jabaws/JpredJabaStructExportImport.java
test/jalview/ws/jabaws/RNAStructExportImport.java