Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Jan 2017 09:03:27 +0000 (09:03 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Jan 2017 09:03:27 +0000 (09:03 +0000)
commita6875ff6ca7894443c98b1d068f78ea25c5bfc87
tree43e2161af938b66419e6c6c66e4b7570d06a2db1
parent67ba2560892f47d848754a97c7a809c7b8f8b3fb
parent976c518ffa15791c680156dd357d33f5a06c3a54
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentI.java
test/jalview/datamodel/AlignmentTest.java