]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Tue, 5 Jul 2011 16:09:08 +0000 (18:09 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 5 Jul 2011 16:09:08 +0000 (18:09 +0200)
commit2ebfd693ebec1b6cf708c58a3330d836d979cd82
tree7e240575a01a255b6c2137334843a2ec5dba8274
parentd7a9c2759dbf0d59d95dbb0b1fcc80af0b9fef41
parent294a6d5a6b209ad84ee3bfda9cf2ca84b92c7f9d
Merge branch 'master' into terencehill/centerprint_stuff

Conflicts:
qcsrc/client/scoreboard.qc
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/scoreboard.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/gamecommand.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_keyhunt.qc