Merge branch 'features/JAL-1956_featureStyles' into merge_JAL-1956
authorJim Procter <jprocter@issues.jalview.org>
Tue, 21 Jun 2016 13:53:15 +0000 (14:53 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 21 Jun 2016 13:53:15 +0000 (14:53 +0100)
commit57a942fc12f3e28a1924eed91f05abe31936dd14
tree16a2451dba7374c7898c0d02a5fc1ab0d1ba5093
parentcbc07eab0291f023f89b2554c488ae9e4587ae2a
parentbf0d052fef43e9809b7170dbfd372b3ea116391b
Merge branch 'features/JAL-1956_featureStyles' into merge_JAL-1956
src/jalview/gui/Jalview2XML.java
test/jalview/io/FeaturesFileTest.java