]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sat, 28 Sep 2013 08:08:52 +0000 (01:08 -0700)
committerMario <mario.mario@y7mail.com>
Sat, 28 Sep 2013 08:08:52 +0000 (01:08 -0700)
commit3f31f8cb0402fe3abe4131023d347a66d2385606
tree9cd3f1b20871018148f691507273e106f844d02e
parentb2295407f27d75eaa53bcf5dad11e0ac06b55c17
parentbe103aa4d18acd071c841f8a0463415a8f508485
Merge branch 'master' into Mario/monsters
defaultXonotic.cfg
qcsrc/common/mapinfo.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/t_items.qc