Merge branch 'master' into divVerent/crypto2
[xonotic/xonotic.git] / data / .gitignore
1 xonotic-*.pk3dir
2 *.pk3