Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
[xonotic/xonotic.git] / data / .gitignore
1 xonotic-*.pk3dir
2 *.pk3