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

summary | shortlog | log | commit | commitdiff | tree
(merge: 926ed1b 19e5fa4)

author	Mario <mario@smbclan.net>
	Sat, 5 Aug 2017 10:03:59 +0000 (20:03 +1000)
committer	Mario <mario@smbclan.net>
	Sat, 5 Aug 2017 10:03:59 +0000 (20:03 +1000)
commit	3018b03b7ad0decee85f2a659783d0b5309fe5a3
tree	c7a935ce80eb07d530a51512a7e91f61d7760d59	tree \| snapshot
parent	926ed1b0236982412cf330acad1298e0581e4e6e	commit \| diff
parent	19e5fa4ee9a0bb59c1cec92a1b0501b14f8ccb63	commit \| diff

Merge branch 'master' into Mario/cs_clientcvars

# Conflicts:
# qcsrc/server/client.qh

18 files changed:

qcsrc/common/mutators/mutator/buffs/sv_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/nades/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics/player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/default/bot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_cts.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_race.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	diff2 \|	blob \| history