]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 14 May 2013 02:53:01 +0000 (12:53 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 14 May 2013 02:53:01 +0000 (12:53 +1000)
commita9fd8f699cad3e52b829a99864db55228354e021
tree2a1b035d6e1e03bdb73219b9118880ef77c42df8
parent9780138b1a731df661c53ad1a02e0427d5bb351e
parent697447ac86b204295fb2cb8bae3160b39af2ccfb
Merge branch 'master' into Mario/monsters
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/t_items.qc