Merge branch 'JAL-1164_disorderforselection' into Release_2_8_1_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 11 Oct 2013 11:24:08 +0000 (12:24 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 11 Oct 2013 11:24:08 +0000 (12:24 +0100)
commitb1ec3caa00df9beb437ca31647268158a79748c5
tree6f5eaca50098963267ab5eb804eedc0591ff3cb5
parent422c5eed9a3d76a2f2a22aa2fc76a40350861f5c
parent51f4e1c750d0de8937e69788f7b14c6120fd310f
Merge branch 'JAL-1164_disorderforselection' into Release_2_8_1_Branch

Conflicts:
src/jalview/api/AlignViewportI.java
src/jalview/ws/jws2/JabawsAlignCalcWorker.java
src/jalview/datamodel/SequenceGroup.java
src/jalview/ws/jws2/AADisorderClient.java
src/jalview/ws/jws2/JabawsAlignCalcWorker.java
src/jalview/ws/jws2/JabawsCalcWorker.java