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