]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/tturrets/units/unit_mlrs.qc
Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Thu, 5 Jul 2012 19:57:44 +0000 (21:57 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 5 Jul 2012 19:57:44 +0000 (21:57 +0200)
commit2e8d8e34f5654af82145fc687faaf9c1ce54fe34
tree4b4783cbd000950f5f317ba01c1015b95627111a
parent7a7032dc05e4a33d6b1c41f11d80dd93bb2ef4f3
parentb8244e7265fbd91b817bd0cb44a0a834861e75b6
Merge branch 'master' into terencehill/itemstime
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/t_items.qc