Merge branch 'Release_2_8_1_Branch' into JAL-1372_referenceseq
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 2 May 2014 10:10:28 +0000 (11:10 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 2 May 2014 10:10:28 +0000 (11:10 +0100)
commit63a18b71aa3ed6503b6fbb8ec3543b5d66ed3f70
tree357a672f6a30a274b3fe1037f7c7ac93a4a0589c
parent9cbe7b851c119115631c2af7e30ef4a806496bde
parent20cbd628749ac9c90b8596c386a24c5778f42c49
Merge branch 'Release_2_8_1_Branch' into JAL-1372_referenceseq

Conflicts:
src/jalview/appletgui/APopupMenu.java
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/SequenceCollectionI.java
src/jalview/gui/AlignFrame.java

resolved without functionality change
12 files changed:
resources/lang/Messages.properties
src/jalview/api/AlignViewportI.java
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/IdCanvas.java
src/jalview/appletgui/SequenceRenderer.java
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/SequenceCollectionI.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/IdCanvas.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SequenceRenderer.java
src/jalview/viewmodel/AlignmentViewport.java