Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
[jalview.git] / nbproject /
drwxr-xr-x   ..
-rw-r--r-- 1455 genfiles.properties
-rw-r--r-- 5970 project.properties
-rw-r--r-- 1294 project.xml