Merge branch 'Release_2_7_Branch' into develop

author jprocter <jprocter@compbio.dundee.ac.uk>

Thu, 1 Mar 2012 12:07:04 +0000 (12:07 +0000)

committer jprocter <jprocter@compbio.dundee.ac.uk>

Thu, 1 Mar 2012 12:07:04 +0000 (12:07 +0000)
author jprocter <jprocter@compbio.dundee.ac.uk>
Thu, 1 Mar 2012 12:07:04 +0000 (12:07 +0000)
committer jprocter <jprocter@compbio.dundee.ac.uk>
Thu, 1 Mar 2012 12:07:04 +0000 (12:07 +0000)
diff --cc src/jalview/ext/jmol/JalviewJmolBinding.java
Simple merge
diff --cc src/jalview/gui/AppJmol.java
Simple merge
diff --cc src/jalview/gui/Jalview2XML.java
Simple merge
diff --cc src/jalview/gui/RestInputParamEditDialog.java
Simple merge
diff --cc src/jalview/util/Platform.java
Simple merge
diff --cc src/jalview/ws/rest/RestServiceDescription.java
Simple merge
author	jprocter <jprocter@compbio.dundee.ac.uk>
	Thu, 1 Mar 2012 12:07:04 +0000 (12:07 +0000)
committer	jprocter <jprocter@compbio.dundee.ac.uk>
	Thu, 1 Mar 2012 12:07:04 +0000 (12:07 +0000)
		1	2
src/jalview/ext/jmol/JalviewJmolBinding.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AppJmol.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/Jalview2XML.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/RestInputParamEditDialog.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/util/Platform.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/ws/rest/RestServiceDescription.java	patch \|	diff1 \|	diff2 \|	blob \| history