Clone
jprocter <jprocter@compbio.dundee.ac.uk>
committed
10 years and 2 months ago
Merge remote-tracking branch 'remotes/origin/2_5_1_rna_merge' into develop (JAL-826)
Conflicts:
.classpath
help/html/menus/alignmentMenu.h… Show more
Merge remote-tracking branch 'remotes/origin/2_5_1_rna_merge' into develop (JAL-826)

Conflicts:

        .classpath

        help/html/menus/alignmentMenu.html

        help/html/whatsNew.html

        src/jalview/gui/PopupMenu.java

Show less

master + 618 more