]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Sun, 18 Dec 2011 15:27:37 +0000 (16:27 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 18 Dec 2011 15:27:37 +0000 (16:27 +0100)
commit4239366e87244ca0b02a16d76f4967ef797e03d5
treee8db051446ae12d889c18054c4e7aee26a952d20
parent6e85d6217aa71cf52300b87dc98e0e5d666c69fe
parent685d33ff6a00b6bc96a891ebf295b3b9eeb9c277
Merge branch 'master' into terencehill/itemstime
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/t_items.qc