Merge branch 'feature/JAL-674_dssp' into features/JAL-1264_showHideAnnotations features/JAL-1264_showHideAnnotations
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 16 Oct 2014 12:41:05 +0000 (13:41 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 16 Oct 2014 12:41:05 +0000 (13:41 +0100)
commit32973e4c3a37dd4485c4190f45bbf43017af40df
tree2d395a5cfa8fe5202d723bc9a650b9175377d39f
parentda82f3c35066f27c4632b2f7c5d818dc1b9a6547
parent4c46bbeeb645f914293383092f8c6bf022a870e4
Merge branch 'feature/JAL-674_dssp' into features/JAL-1264_showHideAnnotations
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/FeatureSettings.java