]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Mon, 27 Jun 2011 16:28:49 +0000 (18:28 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 27 Jun 2011 16:28:49 +0000 (18:28 +0200)
commit73406cea479bf391c611c4c4688d498537797e27
tree6fc745401b1fa6637ebdc6513482bd5f2425d751
parent7ac173a3751fc32b7222c0a36d421c7918e79fd3
parentf36464fbe3e44d957802d4fbced16b9280660ea2
Merge branch 'master' into terencehill/centerprint_stuff
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/w_minstanex.qc