git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: b948e76)
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)
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


No differences found