]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Sun, 31 Mar 2013 21:31:01 +0000 (23:31 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 31 Mar 2013 21:31:01 +0000 (23:31 +0200)
commitfe2c20aee6dd13a656f73eaa836e47a3f6fdca1a
treeb834135462f32b16577a7b3da53c7f2c4d61cf86
parent8efd57a19fca1883ac466f08bb76cdafc8b580cb
parent2eb667170068c570763b07108da07c05622a4f93
Merge branch 'master' into terencehill/itemstime
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc