Merge remote-tracking branch 'origin/5.4'
[scilab.git] / .gitignore
1 workspace/
2 .DS_Store