Merge branch 'Release_2_8_2_Branch' into Release_2_8_2_Branch_i18n
authorJim Procter <j.procter@dundee.ac.uk>
Fri, 3 Oct 2014 10:01:28 +0000 (11:01 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Fri, 3 Oct 2014 10:01:28 +0000 (11:01 +0100)
commitbe5302e00fffeacc62877c2aca981eb9ede3525e
treef6f4f558bb460b10fe4b6b33210118374c4d7f85
parent01695c742a6ff14ef4928fc305e6d2a30035f9ac
parent1052132a5a191173964d4e7fec936f9ee33c9ac6
Merge branch 'Release_2_8_2_Branch' into Release_2_8_2_Branch_i18n
src/jalview/gui/UserDefinedColours.java