git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 967b7a0 39c6fe8)

author	Mario <mario.mario@y7mail.com>
	Fri, 18 Oct 2013 22:40:46 +0000 (09:40 +1100)
committer	Mario <mario.mario@y7mail.com>
	Fri, 18 Oct 2013 22:40:46 +0000 (09:40 +1100)
commit	410ff5f6cc4f7d5d8282ba9d93fe6a65d1c74489
tree	e88197c3d4ebddef49f7ea7a2c6b5ea74974728b	tree \| snapshot
parent	967b7a02f1457708567a7fd999c60f5984d5513b	commit \| diff
parent	39c6fe854bc866de4089c9a48a7db488296285db	commit \| diff

Merge branch 'master' into Mario/monsters

12 files changed:

commands.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history