Merge branch 'JAL-3927_ws_preferences_dialog_fix' into alpha/JAL-3066_Jalview_212_sli...
[jalview.git] / nbproject /
drwxr-xr-x   ..
-rw-r--r-- 1455 genfiles.properties
-rw-r--r-- 5970 project.properties
-rw-r--r-- 1294 project.xml