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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 446021f 591e13c)

author	Samual Lenks <samual@xonotic.org>
	Tue, 11 Dec 2012 21:53:06 +0000 (16:53 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Tue, 11 Dec 2012 21:53:06 +0000 (16:53 -0500)
commit	74cb317eb10d44a2f21bd16c352092da742f880f
tree	19f094d8e7936d537d8f6857016c1065e6d74f39	tree \| snapshot
parent	446021f8a91f43d8dd8f40ffadbc8460ebab2cca	commit \| diff
parent	591e13cf6bf66a6b14039ce393a5d5dbb9f8bc3c	commit \| diff

Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	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/g_world.qc	diff1 \|	diff2 \|	blob \| history