]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 18 Oct 2013 22:40:46 +0000 (09:40 +1100)
committerMario <mario.mario@y7mail.com>
Fri, 18 Oct 2013 22:40:46 +0000 (09:40 +1100)
commit410ff5f6cc4f7d5d8282ba9d93fe6a65d1c74489
treee88197c3d4ebddef49f7ea7a2c6b5ea74974728b
parent967b7a02f1457708567a7fd999c60f5984d5513b
parent39c6fe854bc866de4089c9a48a7db488296285db
Merge branch 'master' into Mario/monsters
12 files changed:
commands.cfg
defaultXonotic.cfg
qcsrc/client/progs.src
qcsrc/common/notifications.qh
qcsrc/common/util.qh
qcsrc/menu/progs.src
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src