]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ca_arena_mutators
authorterencehill <piuntn@gmail.com>
Thu, 14 Mar 2013 21:29:57 +0000 (22:29 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 14 Mar 2013 21:29:57 +0000 (22:29 +0100)
commitb58d514c07e4b22b86a93977653787902efba1d6
tree82b4da2790af9601474f2117c7cff9e8474eb4b9
parent9bc9f1ca09aa498304c26b9da970e48da05f3124
parent489318817dc508e24f479090ddcf53ace10adbf0
Merge branch 'master' into terencehill/ca_arena_mutators
_hud_descriptions.cfg
qcsrc/client/hud.qc
qcsrc/common/notifications.qh