Merge branch 'asciiwolf/xonotic-makefile-fix'
[xonotic/xonotic.git] / Docs / egyptsoc /
2011-08-29 mand1ngaMerge branch 'master' into mand1nga/update-docs
2011-08-29 mand1ngaMerge branch 'master' of ssh://git.xonotic.org/xonotic
2011-08-24 Rudolf Polzerconvert the txt files explicitly to DOS format, and...
2010-04-26 Rudolf PolzerMerge branch 'master' of ssh://git.xonotic.org/xonotic
2010-04-22 Rudolf PolzerMerge commit 'origin/esteel/ignore'
2010-04-17 Rudolf Polzerfix lots of CRLFs
2010-03-18 xonoticinitial checkin from nexuiz svn r8756