]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Sat, 28 May 2011 08:52:29 +0000 (10:52 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 28 May 2011 08:52:29 +0000 (10:52 +0200)
commit4b2c76f4ddbe8e880e94fb42c5032b106fb5bfb4
treeba17381d511d1ee294918ca103a53c65245fcc2d
parentec91b041bb051470efb5ae7c0358a77a64c26253
parentccb58bb7bd62f64a64ed18232d7b0ab475816939
Merge branch 'master' into terencehill/centerprint_stuff

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc