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

author	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 14 Dec 2014 01:22:25 +0000 (12:22 +1100)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 14 Dec 2014 01:29:44 +0000 (12:29 +1100)
commit	094f9682a7e8258a383ea9574dc7144eaf7ceecc
tree	735be96ec57c404a365d36913a71beb5390f9888	tree \| snapshot
parent	a94cd06c4cc5cb8c51ccb40ef77f93b4b6131207	commit \| diff
parent	7e3735739bcbede6b9dbccad4610eaff05ac1674	commit \| diff

Merge remote-tracking branch 'origin/master' into TimePath/combined_updates

Conflicts:
effects-high.cfg
effects-ultra.cfg
qcsrc/client/View.qc
qcsrc/common/mapinfo.qh
qcsrc/menu/classes.c
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
qcsrc/menu/xonotic/dialog_settings_effects.c

25 files changed:

crosshairs.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes.cfg	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.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/menu.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_settings_effects.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/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/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/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history

RSS Atom

crosshairs.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes.cfg	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.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/menu.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_settings_effects.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/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/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/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history