Merge branch 'Release_2_8_1_Branch' into Release_2_8_1_Branch_i18n
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 8 Oct 2013 14:23:40 +0000 (15:23 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 8 Oct 2013 14:23:40 +0000 (15:23 +0100)
commit452e24303ecf7861ff827c19fcd0fdaa1d288ea1
tree051d9cc01ba66f3fa07fed4dbb844af976d885a0
parent64238c060481db2d63a9f6d3e013bcca1693eba5
parent2635d96c3715a81c99dbcd6782ce2eea5bd5bff6
Merge branch 'Release_2_8_1_Branch' into Release_2_8_1_Branch_i18n

Conflicts:
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/Desktop.java
src/jalview/gui/SeqPanel.java
src/jalview/gui/TreeCanvas.java
src/jalview/jbgui/GAlignFrame.java