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: f38d2a9 360a188)

author	Samual Lenks <samual@xonotic.org>
	Wed, 1 Jan 2014 14:17:02 +0000 (09:17 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Wed, 1 Jan 2014 14:17:02 +0000 (09:17 -0500)
commit	2a355a6602f5697afc155e1a28cab59f2b24132f
tree	09b18a8dd35438e51a4c6443acedaa9b3d182ae6	tree \| snapshot
parent	f38d2a98e9da344460c3412de5164325972087c6	commit \| diff
parent	360a188afcd740bcb79138fbed32aafcf1f0bca1	commit \| diff

Merge remote-tracking branch 'origin/master' into Mario/monsters

15 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/accuracy.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.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/w_shotgun.qc	diff1 \|	diff2 \|	blob \| history