Merge remote-tracking branch 'origin/master' into newsfeed
[scilab.git] / .gitignore
1 /workspace*/
2 .DS_Store
3 /.gitreview