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

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

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

author	Mario <zacjardine@y7mail.com>
	Sun, 2 Aug 2015 04:20:22 +0000 (14:20 +1000)
committer	Mario <zacjardine@y7mail.com>
	Sun, 2 Aug 2015 04:20:22 +0000 (14:20 +1000)
commit	fc2be4c1e7547ae97301f7966333e4dc858baf92
tree	d08119c7c4dc66ff21ae1154f763fbc648abf39b	tree \| snapshot
parent	9281dfd2d6431363c20f147e53a86480a99ca2df	commit \| diff
parent	09616f413d96c0436c5129cbcf78d95163fc1640	commit \| diff

Merge branch 'master' into Mario/ons_updates

# Conflicts:
# qcsrc/client/hud.qc
# qcsrc/client/hud.qh
# qcsrc/client/main.qc
# qcsrc/common/constants.qh
# qcsrc/common/stats.qh
# qcsrc/server/autocvars.qh
# qcsrc/server/bot/havocbot/havocbot.qc
# qcsrc/server/mutators/gamemode_onslaught.qc

36 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/command/cl_cmd.qc	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/hud_config.qh	\|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/mapvoting.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/mapvoting.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/teamradar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/teamradar.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/triggers.qh	\|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/role_onslaught.qc	blob1 \|	blob2 \|	history
qcsrc/server/bot/havocbot/roles.qc	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/miscfunctions.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qh	diff1 \|	\|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/command/cl_cmd.qc	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/hud_config.qh	\|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/mapvoting.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/mapvoting.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/teamradar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/teamradar.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/triggers.qh	\|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/role_onslaught.qc	blob1 \|	blob2 \|	history
qcsrc/server/bot/havocbot/roles.qc	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/miscfunctions.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_onslaught.qh	diff1 \|	\|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history