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	Samual Lenks <samual@xonotic.org>
	Fri, 21 Dec 2012 08:45:43 +0000 (03:45 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Fri, 21 Dec 2012 08:45:43 +0000 (03:45 -0500)
commit	3b4538464212cdef7e377e6e203e820178a76fe6
tree	5275c67a25179dced2291b146b14fecf903cc6ae	tree \| snapshot
parent	7825c6ee327e7dcfb1443a98248810f7a0a033a0	commit \| diff
parent	0202aaed3286672d956d58deecdeb315d2871bf5	commit \| diff

Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

Conflicts:
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_nexball.qc

34 files changed:

qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/shownames.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/attic/nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/role_onslaught.qc	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/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_keepaway.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_superspec.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_grenadelauncher.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_laser.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_rocketlauncher.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_tuba.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/shownames.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/attic/nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/role_onslaught.qc	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/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_keepaway.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_nexball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_superspec.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_grenadelauncher.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_laser.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_rocketlauncher.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_tuba.qc	diff1 \|	diff2 \|	blob \| history