JAL-1159 Merging 2.8.1 patches and Anne Menards work from 2012 into development branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 15 Oct 2013 10:21:04 +0000 (11:21 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 15 Oct 2013 10:21:04 +0000 (11:21 +0100)
commit21d6c27e237d77ae258755562aa8abdc6b5320b8
tree492a27868553d316262f61363bea745afc53ddb3
parenta9315b41e948f66f4632f7d419fda643bc0b9354
parent7f3ee80b1dac4fa99bb0ea0c3af92046bec43a77
JAL-1159 Merging 2.8.1 patches and Anne Menards work from 2012 into development branch
Merge branch 'develop_m2_8_1_2' into dev_from_2_8_1

Conflicts:
src/jalview/appletgui/AlignFrame.java
src/jalview/renderer/AnnotationRenderer.java
.classpath
src/MCview/PDBViewer.java
src/jalview/analysis/StructureFrequency.java
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/AssociatePdbFileWithSeq.java
src/jalview/gui/Desktop.java
src/jalview/gui/PopupMenu.java
src/jalview/renderer/AnnotationRenderer.java