Merge remote-tracking branch 'origin/master' into mkws-294
[mkws-moved-to-github.git] / .gitignore
1 *~
2 *.swp