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: 15a4497 55f8742)

author	Samual Lenks <samual@xonotic.org>
	Tue, 7 May 2013 05:13:01 +0000 (01:13 -0400)
committer	Samual Lenks <samual@xonotic.org>
	Tue, 7 May 2013 05:13:01 +0000 (01:13 -0400)
commit	026dde2924af9bca060bc1bea3e194c47e98b4be
tree	fdf2559a5a282b4d455b6abbf3cfa97049169c0d	tree \| snapshot
parent	15a449780e666b73d76cef39230b15ade1daf45f	commit \| diff
parent	55f87426a3f58e4161eae8a7e8523f165cb9da00	commit \| diff

Merge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators

14 files changed:

qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud_config.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history