Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 1 Dec 2010 08:03:27 +0000 (09:03 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 1 Dec 2010 08:03:27 +0000 (09:03 +0100)
1  2 
qcsrc/server/g_world.qc

Simple merge