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: 206d656 00057ff)

author	FruitieX <fruitiex@gmail.com>
	Mon, 11 Apr 2011 12:56:27 +0000 (15:56 +0300)
committer	FruitieX <fruitiex@gmail.com>
	Mon, 11 Apr 2011 12:56:27 +0000 (15:56 +0300)
commit	df9569abb4918e69c083528206451f783af24eeb
tree	9219de358e6e288467a1c5317024192f9a172090	tree \| snapshot
parent	206d65649e8a9d5c66a984d032d11043814b15b2	commit \| diff
parent	00057ff3db596385bc460120e83228db4b222f64	commit \| diff

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

Conflicts:
defaultXonotic.cfg
hud_luminos.cfg
qcsrc/client/hud.qc

13 files changed:

_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_xhair_minimal.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/hud_config.qc	diff1 \|	\|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
tooltips.db	diff1 \|	diff2 \|	blob \| history