]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Tue, 1 Jan 2013 19:29:35 +0000 (14:29 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 1 Jan 2013 19:29:35 +0000 (14:29 -0500)
commitb406886ef085ef818032e8a0bcafe45b85b8f74d
tree4b3743590790273985f77f08e8317746b27becbd
parent6fdab86857d5334d84a3720ec28d863d9da1544a
parent6afb0f54f644ea245b899b092db98acf506974f2
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
21 files changed:
commands.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/hud.qc
qcsrc/client/main.qh
qcsrc/client/miscfunctions.qc
qcsrc/common/util.qh
qcsrc/menu/progs.src
qcsrc/server/autocvars.qh
qcsrc/server/bot/bot.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_seeker.qc