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

author	Mario <zacjardine@y7mail.com>
	Mon, 17 Nov 2014 23:58:19 +0000 (10:58 +1100)
committer	Mario <zacjardine@y7mail.com>
	Mon, 17 Nov 2014 23:58:19 +0000 (10:58 +1100)
commit	5e3a7beca384caa6f3da36fe07b29aff942e7b3e
tree	cc8391e8a3fe7a57cc534de4e5808b74172ec1f7	tree \| snapshot
parent	bfd4316c7714f8982a0d0a771b7bd616241fbb8b	commit \| diff
parent	99a15ec6d46a049ac04446c17ad407551dd500e1	commit \| diff

Merge branch 'master' into samual/combined_updates

Conflicts:
defaultXonotic.cfg
effects-high.cfg
effects-low.cfg
effects-med.cfg
effects-normal.cfg
effects-omg.cfg
effects-ultimate.cfg
effects-ultra.cfg
qcsrc/common/mapinfo.qh
qcsrc/menu/xonotic/demolist.c
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/gametypelist.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/maplist.c
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/playerstats.qc
qcsrc/server/progs.src

41 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
effects-high.cfg	diff1 \|	diff2 \|	blob \| history
effects-low.cfg	diff1 \|	diff2 \|	blob \| history
effects-med.cfg	diff1 \|	diff2 \|	blob \| history
effects-normal.cfg	diff1 \|	diff2 \|	blob \| history
effects-omg.cfg	diff1 \|	diff2 \|	blob \| history
effects-ultimate.cfg	diff1 \|	diff2 \|	blob \| history
effects-ultra.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes.cfg	diff1 \|	diff2 \|	blob \| history
gfx/menu/luminos/skinvalues.txt	diff1 \|	diff2 \|	blob \| history
gfx/menu/wickedx/skinvalues.txt	diff1 \|	diff2 \|	blob \| history
gfx/menu/xaw/skinvalues.txt	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/classes.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/menu.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/skin-customizables.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/demolist.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_create.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_settings_effects.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/gametypelist.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/mainwindow.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/serverlist.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/slider.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.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_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mapvoting.qc	\|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
effects-high.cfg	diff1 \|	diff2 \|	blob \| history
effects-low.cfg	diff1 \|	diff2 \|	blob \| history
effects-med.cfg	diff1 \|	diff2 \|	blob \| history
effects-normal.cfg	diff1 \|	diff2 \|	blob \| history
effects-omg.cfg	diff1 \|	diff2 \|	blob \| history
effects-ultimate.cfg	diff1 \|	diff2 \|	blob \| history
effects-ultra.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes.cfg	diff1 \|	diff2 \|	blob \| history
gfx/menu/luminos/skinvalues.txt	diff1 \|	diff2 \|	blob \| history
gfx/menu/wickedx/skinvalues.txt	diff1 \|	diff2 \|	blob \| history
gfx/menu/xaw/skinvalues.txt	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/classes.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/menu.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/skin-customizables.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/demolist.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_create.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_settings_effects.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/gametypelist.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/mainwindow.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/serverlist.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/slider.c	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.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_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mapvoting.qc	\|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history