Merge remote-tracking branch 'refs/remotes/origin/master' into YaSp
[scilab.git] / .gitignore
1 workspace/
2 .DS_Store