Merge branch 'feature/JAL-674_dssp' into features/JAL-1264_showHideAnnotations features/JAL-1264_showHideAnnotations
[jalview.git] / nbproject /
drwxr-xr-x   ..
-rw-r--r-- 1455 genfiles.properties
-rw-r--r-- 5904 project.properties
-rw-r--r-- 1284 project.xml