Merge branch 'master' into divVerent/crypto2
[xonotic/xonotic.git] / data / .gitignore
2010-06-17 Rudolf PolzerMerge branch 'master' of ssh://git.xonotic.org/xonotic
2010-06-17 Rudolf Polzerdo not track .pk3 files in data/
2010-03-18 xonoticput .gitignore in the right place