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	Mario <zacjardine@y7mail.com>
	Wed, 4 Feb 2015 16:38:30 +0000 (03:38 +1100)
committer	Mario <zacjardine@y7mail.com>
	Wed, 4 Feb 2015 16:38:30 +0000 (03:38 +1100)
commit	af31a0377d1aa0e1f84bfda4a1584c4af9a66b40
tree	59cabd4b2c22417f5433acb7e6a0e2660f3143f4	tree \| snapshot
parent	718837e7459658d876662a2a59c4df356f8cf288	commit \| diff
parent	c36125569f424bea49b14873f7235e220b5806ef	commit \| diff

435 conflicts, 135 files conflicts, fixed in 7 hours #nolife

284 files changed:

qcsrc/Makefile	diff1 \|	diff2 \|	blob \| history
qcsrc/client/announcer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/announcer.qh	\|	\|	blob
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/command/cl_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/conquest.qc	diff1 \|	\|	blob \| history
qcsrc/client/conquest.qh	diff1 \|	\|	blob \| history
qcsrc/client/controlpoint.qc	diff1 \|	\|	blob \| history
qcsrc/client/controlpoint.qh	diff1 \|	\|	blob \| history
qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/defs.qh	\|	diff2 \|	blob \| history
qcsrc/client/generator.qc	diff1 \|	\|	blob \| history
qcsrc/client/generator.qh	diff1 \|	\|	blob \| history
qcsrc/client/hook.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/laser.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	\|	diff2 \|	blob \| history
qcsrc/client/main.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/mapvoting.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/particles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/player_skeleton.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/player_skeleton.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/tturrets.qc	blob1 \|	blob2 \|	history
qcsrc/client/tturrets.qh	blob1 \|	blob2 \|	history
qcsrc/client/vehicles/vehicles.qc	blob1 \|	blob2 \|	history
qcsrc/client/vehicles/vehicles.qh	blob1 \|	blob2 \|	history
qcsrc/client/view.qc	\|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/weapons/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/animdecide.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/animdecide.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/buffs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/command/generic.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/command/script.qh	diff1 \|	\|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/csqcmodel_settings.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/deathtypes.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/effects.qc	diff1 \|	\|	blob \| history
qcsrc/common/effects.qh	diff1 \|	\|	blob \| history
qcsrc/common/jeff.qh	diff1 \|	\|	blob \| history
qcsrc/common/mapinfo.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/minigames/cl_minigames.qc	diff1 \|	\|	blob \| history
qcsrc/common/minigames/cl_minigames.qh	diff1 \|	\|	blob \| history
qcsrc/common/minigames/cl_minigames_hud.qc	diff1 \|	\|	blob \| history
qcsrc/common/minigames/minigame/all.qh	diff1 \|	\|	blob \| history
qcsrc/common/minigames/minigame/ttt.qc	diff1 \|	\|	blob \| history
qcsrc/common/minigames/minigames.qc	diff1 \|	\|	blob \| history
qcsrc/common/minigames/minigames.qh	diff1 \|	\|	blob \| history
qcsrc/common/minigames/sv_minigames.qc	diff1 \|	\|	blob \| history
qcsrc/common/minigames/sv_minigames.qh	diff1 \|	\|	blob \| history
qcsrc/common/monsters/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/afrit.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/creeper.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/demon.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/enforcer.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/ogre.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/rotfish.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/rottweiler.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/scrag.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/spawn.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/vore.qc	diff1 \|	\|	blob \| history
qcsrc/common/monsters/monster/wyvern.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/zombie.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monsters.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/spawn.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/playerstats.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/playerstats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/teams.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/all.qh	diff1 \|	\|	blob \| history
qcsrc/common/turrets/cl_turrets.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/cl_turrets.qh	diff1 \|	\|	blob \| history
qcsrc/common/turrets/sv_turrets.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/sv_turrets.qh	diff1 \|	\|	blob \| history
qcsrc/common/turrets/turrets.qh	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/ewheel.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/flac.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/fusionreactor.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/hellion.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/hk.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/machinegun.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/mlrs.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/phaser.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/plasma.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/plasma_dual.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/tesla.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/unit/walker.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/util.qc	diff1 \|	\|	blob \| history
qcsrc/common/turrets/util.qh	\|	\|	blob
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/cl_vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/cl_vehicles.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/bumblebee.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/bumblebee.qh	\|	\|	blob
qcsrc/common/vehicles/unit/racer.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/raptor.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/spiderbot.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/tankll48.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/unit/yugo.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles.qh	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles_include.qc	diff1 \|	\|	blob \| history
qcsrc/common/vehicles/vehicles_include.qh	diff1 \|	\|	blob \| history
qcsrc/common/weapons/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_blaster.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_devastator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_hmg.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_lightsabre.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_machinegun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_mortar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_revolver.qc	diff1 \|	\|	blob \| history
qcsrc/common/weapons/w_rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_rpc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_shockwave.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_shotgun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapons.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/csqcmodellib/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/dpdefs/csprogsdefs.qh	\|	diff2 \|	blob \| history
qcsrc/dpdefs/menudefs.qh	\|	diff2 \|	blob \| history
qcsrc/menu/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/antilag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/aim.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/bot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/bot.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/havocbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/havocbot/roles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cheats.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_impulse.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_physics.qh	\|	\|	blob
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qh	\|	diff2 \|	blob \| history
qcsrc/server/cl_weapons.qc	diff1 \|	\|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/common.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/controlpoint.qc	diff1 \|	\|	blob \| history
qcsrc/server/controlpoint.qh	diff1 \|	\|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/func_breakable.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qh	\|	diff2 \|	blob \| history
qcsrc/server/g_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_subs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_triggers.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/generator.qc	diff1 \|	\|	blob \| history
qcsrc/server/generator.qh	diff1 \|	\|	blob \| history
qcsrc/server/jeff.qc	diff1 \|	\|	blob \| history
qcsrc/server/jeff.qh	\|	\|	blob
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qh	\|	diff2 \|	blob \| history
qcsrc/server/mutators/base.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/base.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_assault.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_assault.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ca.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_conquest.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_conquest.qh	diff1 \|	\|	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_cts.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_deathmatch.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_domination.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_domination.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_freezetag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_freezetag.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_infection.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_infection.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_invasion.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_jailbreak.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_jailbreak.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_keepaway.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_keyhunt.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_keyhunt.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_lms.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/gamemode_onslaught.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_race.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_tdm.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_vip.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/gamemode_vip.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_bloodloss.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_buffs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_campcheck.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_dodging.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_freeze.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_freeze.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_hats.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_instagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_instagib.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_itemeditor.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_multijump.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_new_toys.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nix.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_overkill.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_physical_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_piggyback.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_piggyback.qh	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_random_gravity.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_random_vehicles.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_riflearena.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_spawn_near_teammate.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_superspec.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_touchexplode.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_walljump.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutator_zombie_apocalypse.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutators.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators_include.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators_include.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/sandbox.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/portals.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores_rules.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/spawnpoints.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/steerlib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_halflife.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_jumppads.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_quake3.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/common.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/hitplot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/selection.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/warpzonelib/common.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom