Merge branch 'Release_2_7_Branch' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Thu, 1 Mar 2012 12:07:04 +0000 (12:07 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Thu, 1 Mar 2012 12:07:04 +0000 (12:07 +0000)
commit6bd9630607bd38aaf9b42738a0ae90de8fe5c6e8
tree1aa59bded9713d6836884cbb1f76139d41d7ad5a
parent717cecb7c273716fe2f7444bdb4676f813daffbb
parentec4ef38882bce0469ce7c65cd70ceb85421cfbd2
Merge branch 'Release_2_7_Branch' into develop
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/gui/AppJmol.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/RestInputParamEditDialog.java
src/jalview/util/Platform.java
src/jalview/ws/rest/RestServiceDescription.java