Merge branch 'master' into prog-loader
[lunaix-os.git] / .gitignore
1 **/.~lock*
2 workspace/
3 **.odp
4 drafts/