git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 9bf601b 99532b5)

author	FruitieX <fruitiex@gmail.com>
	Wed, 15 Dec 2010 11:50:53 +0000 (13:50 +0200)
committer	FruitieX <fruitiex@gmail.com>
	Wed, 15 Dec 2010 11:50:53 +0000 (13:50 +0200)
commit	3972e5deb9ba49a9ebbf9781a43b337b07d5a116
tree	d5298cda88661ebba196c9866cea3729ad159175	tree \| snapshot
parent	9bf601b5dff8f3fc15acc66b2e7e8813eb6e3420	commit \| diff
parent	99532b575871f692c9eb5541d56bb51b8ac71146	commit \| diff

Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/scoreboard.qc

_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_nexuiz.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history