Merge branch 'develop' into features/JAL-845splitPaneMergeDevelop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 5 Mar 2015 13:50:58 +0000 (13:50 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 5 Mar 2015 13:50:58 +0000 (13:50 +0000)
commit286715d8408510556366a454a748daf8f60444f1
treefcee59de8748816cd21c11cd64e4294b8ac7c7bb
parentc3280dffcb908ebb0e6b1ddc252a63c6ae20c623
parent1718e104b60584336348531e51c8121d69ff6416
Merge branch 'develop' into features/JAL-845splitPaneMergeDevelop

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