Merge branch 'improvement/JAL-1350_makegroups_markedcolumns' into merge/JAL-845_JAL...
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 12 Feb 2015 17:05:17 +0000 (17:05 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 12 Feb 2015 17:05:17 +0000 (17:05 +0000)
commit40bea597e1aac3d7ff0a381d310d90ed10a81ac4
treeb9ffe6a295d5fd4657e09aace45ee33130e949c0
parentd10280f7592e21f1ed4d1030d3ece3e95f3b385b
parent29475c148f5dcf99f0067b44a4ac4f9b07d734d5
Merge branch 'improvement/JAL-1350_makegroups_markedcolumns' into merge/JAL-845_JAL-1640

Conflicts:
src/jalview/datamodel/SequenceGroup.java
src/jalview/datamodel/ColumnSelection.java
src/jalview/datamodel/SequenceGroup.java
src/jalview/datamodel/SequenceI.java