Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into trialMerge
[jalview.git] / nbproject /
drwxr-xr-x   ..
-rw-r--r-- 1455 genfiles.properties
-rw-r--r-- 5970 project.properties
-rw-r--r-- 1294 project.xml