de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - gfx/hud/luma/flag_red_lost.tga

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

author	Mario <zacjardine@y7mail.com>
	Sun, 10 May 2015 23:19:58 +0000 (09:19 +1000)
committer	Mario <zacjardine@y7mail.com>
	Sun, 10 May 2015 23:19:58 +0000 (09:19 +1000)
commit	9eb82dd6fc682e3ddecd471835f9047816236342
tree	4ae45be6eba0697d802ed5aa6dbf93343540f23e	tree \| snapshot
parent	ee32da5f4dafee5883369c759fe8ed042114bda5	commit \| diff
parent	263c592e468eeeffb2755d204b21eb13e398adac	commit \| diff

Merge branch 'master' into terencehill/itemstime

Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/hud.qh
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/server/defs.qh

25 files changed:

_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
hud_luma.cfg	\|	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
hud_luminos_old.cfg	diff1 \|	diff2 \|	blob \| history
hud_nexuiz.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud_config.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/classes.inc	\|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_hudpanel_itemstime.c	diff1 \|	\|	blob \| history
qcsrc/menu/xonotic/mainwindow.qc	\|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
hud_luma.cfg	\|	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
hud_luminos_old.cfg	diff1 \|	diff2 \|	blob \| history
hud_nexuiz.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud_config.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/classes.inc	\|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_hudpanel_itemstime.c	diff1 \|	\|	blob \| history
qcsrc/menu/xonotic/mainwindow.qc	\|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history