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: 8f30e69 81d3d95)

author	terencehill <piuntn@gmail.com>
	Sat, 6 Aug 2016 10:45:11 +0000 (12:45 +0200)
committer	terencehill <piuntn@gmail.com>
	Sat, 6 Aug 2016 10:48:50 +0000 (12:48 +0200)
commit	51c4ab5336d3887b618c13e5f566cf19636af951
tree	0cadef8153a650f952343c502ddc7d331960f0cc	tree \| snapshot
parent	8f30e696325ec85edc4bcfc52b27731d2a28871d	commit \| diff
parent	81d3d953ba1e2b8ffba849b17bad98170216a754	commit \| diff

Merge branch 'master' into terencehill/scoreboard_panel_2

Conflicts:
qcsrc/client/main.qh
qcsrc/client/scoreboard.qc

13 files changed:

_hud_common.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
hud_luma.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal_xhair.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/hud.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/score.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	\|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/mapvoting.qc	diff1 \|	diff2 \|	blob \| history