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	terencehill <piuntn@gmail.com>
	Thu, 7 Mar 2013 00:11:34 +0000 (01:11 +0100)
committer	terencehill <piuntn@gmail.com>
	Thu, 7 Mar 2013 00:11:34 +0000 (01:11 +0100)
commit	3aed354c1125db3e6e862f552c253b06b09d5d86
tree	d69aca8fc12532686b01dbdc38ce63d653b68a5e	tree \| snapshot
parent	f3f7d43d0e8249cd68bb51bff305568ed031b942	commit \| diff
parent	3b84c2fd559e06f8c0a259b28e4813df719758b7	commit \| diff

Merge branch 'master' into terencehill/ca_arena_mutators

Conflicts:
qcsrc/client/announcer.qc
qcsrc/common/constants.qh
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/gamemode_freezetag.qc

30 files changed:

_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal_xhair.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_old.cfg	diff1 \|	diff2 \|	blob \| history
hud_nexuiz.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/announcer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud_config.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/bot.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/cl_weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.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_freezetag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_keyhunt.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_superspec.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minstanex.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal_xhair.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_old.cfg	diff1 \|	diff2 \|	blob \| history
hud_nexuiz.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/announcer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud_config.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/bot.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/cl_weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.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_freezetag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_keyhunt.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_superspec.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minstanex.qc	diff1 \|	diff2 \|	blob \| history