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	Samual Lenks <samual@xonotic.org>
	Wed, 29 Aug 2012 05:14:44 +0000 (01:14 -0400)
committer	Samual Lenks <samual@xonotic.org>
	Wed, 29 Aug 2012 05:14:44 +0000 (01:14 -0400)
commit	e332988cce112231a09d8c9c8c88d889a5fbea83
tree	0dd717f8b817912d5ff38b91eab6dc97b0e47c02	tree \| snapshot
parent	d8e541e5cabb4e7981c0ab2e86f859440f0138f1	commit \| diff
parent	3b354d3d971a82b2f6fbcf4dd6b18e05711d0acf	commit \| diff

Merge remote-tracking branch 'origin/master' into samual/mutator_ctf

Conflicts:
qcsrc/server/mutators/base.qh
qcsrc/server/progs.src
qcsrc/server/vehicles/vehicles.qc
vehicles.cfg

21 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/items.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	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_player.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_triggers.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/base.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_ewheel.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_walker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
vehicles.cfg	diff1 \|	diff2 \|	blob \| history

RSS Atom

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/items.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	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_player.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_triggers.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/base.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutators.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_teleporters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_ewheel.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/tturrets/units/unit_walker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/vehicles/vehicles.qc	diff1 \|	diff2 \|	blob \| history
vehicles.cfg	diff1 \|	diff2 \|	blob \| history