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: 3972e5d 02d238e)

author	FruitieX <fruitiex@gmail.com>
	Wed, 15 Dec 2010 12:04:55 +0000 (14:04 +0200)
committer	FruitieX <fruitiex@gmail.com>
	Wed, 15 Dec 2010 12:04:55 +0000 (14:04 +0200)
commit	2f2147a6c665f04d1b6e860dce8a8a093e7d2b9e
tree	05eaae6623ae1a91743f08a5f9a11dd80f485fd0	tree \| snapshot
parent	3972e5deb9ba49a9ebbf9781a43b337b07d5a116	commit \| diff
parent	02d238e88f088f567092b524a09001bfcacc8d75	commit \| diff

Merge remote branch 'origin/terencehill/newpanelhud-dom_points' into terencehill/newpanelhud

Conflicts:
qcsrc/client/hud.qc
qcsrc/server/domination.qc

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Defs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/domination.qc	diff1 \|	diff2 \|	blob \| history