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: 68fe766 ae85d60)

author	Samual Lenks <samual@xonotic.org>
	Mon, 11 Feb 2013 17:02:16 +0000 (12:02 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Mon, 11 Feb 2013 17:02:16 +0000 (12:02 -0500)
commit	707b95ea2f5399ce787bc7a1087d211bd851d4ff
tree	51c99eebec4925891be24509c0032139d59ed69e	tree \| snapshot
parent	68fe766f62dd4d44f686110ba8984789b079d005	commit \| diff
parent	ae85d60ebc101e971a9dee8937c01309070add68	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/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history