Merge branch 'JAL-1372_referenceseq' into feature_29/JAL-1372_referenceseq
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 9 Jan 2015 17:12:04 +0000 (17:12 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 9 Jan 2015 17:12:04 +0000 (17:12 +0000)
commitb948e764c92b0954100f216927114b2c9720b76c
treeb44f1aa3609133b5de3571d93fc8dbf70bd34c16
parentb5d61763044c1d72f06ce0e50da2171422a3774b
parent0163e98c7c067236a8ef7080860db5376f4ce0ef
Merge branch 'JAL-1372_referenceseq' into feature_29/JAL-1372_referenceseq
merge forward to implement support for reference sequences in 2.9
Conflicts:
resources/lang/Messages.properties
src/jalview/appletgui/APopupMenu.java
src/jalview/datamodel/Alignment.java
src/jalview/gui/PopupMenu.java
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