]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/universal_reload_system
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 28 Feb 2011 13:27:21 +0000 (15:27 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 28 Feb 2011 13:27:21 +0000 (15:27 +0200)
commitf2562c4ce3305b5d3724ae03015d35abdaa12b83
treef90f56d80ee0a302c2e8262a787eee1017524bd6
parentbc91f7dc48927953480bdc9622973c7de075fb5f
parentdfa574e25f8cbda3c500b7d434a09f24ccf2d48c
Merge branch 'master' into mirceakitsune/universal_reload_system
qcsrc/server/defs.qh
qcsrc/server/g_world.qc