]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Fri, 30 Dec 2011 09:02:18 +0000 (10:02 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 30 Dec 2011 09:02:18 +0000 (10:02 +0100)
1  2 
qcsrc/server/defs.qh

Simple merge