Merge branch 'Release_2_7_Branch_hotfix_JAL-962' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Oct 2011 12:13:45 +0000 (13:13 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Oct 2011 12:13:45 +0000 (13:13 +0100)
commit8d5a12d996b49525f7c5b83f3cc280aeb7c3fda7
tree922e61a76fa3749e0ab768e8b27f74b58e289c4b
parentf1aa6cadf63d2368d6c9d87c6bc53de2805fd104
parent691798cf6a90094f4c83e79fd5c703457b1135b0
Merge branch 'Release_2_7_Branch_hotfix_JAL-962' into develop
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/FeatureRenderer.java
src/jalview/appletgui/FeatureSettings.java
src/jalview/bin/JalviewLite.java
src/jalview/javascript/JalviewLiteJsApi.java