Merge branch 'JAL-972-dasobert-to-jdas' into JAL-972-jdas
[jalview.git] / nbproject /
drwxr-xr-x   ..
-rw-r--r-- 1428 genfiles.properties
-rw-r--r-- 5881 project.properties
-rw-r--r-- 1289 project.xml