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: 588148c ede5abf)

author	Mario <mario.mario@y7mail.com>
	Wed, 8 May 2013 02:04:39 +0000 (12:04 +1000)
committer	Mario <mario.mario@y7mail.com>
	Wed, 8 May 2013 02:04:39 +0000 (12:04 +1000)
commit	2bb2db9c0f8016645a23381d7493588d748ecacf
tree	230ead2355107cacd063da79462f41f6f4ce926e	tree \| snapshot
parent	588148c163f6837f4608b4c1353f3bc7a88f57b5	commit \| diff
parent	ede5abf38f36b3103b6e5170b6185b17652ce412	commit \| diff

Merge branch 'master' into Mario/mutator_minstagib

19 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/aim.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_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_world.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/mutator_minstagib.qc	diff1 \|	\|	blob \| history
qcsrc/server/mutators/mutators.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minstanex.qc	diff1 \|	diff2 \|	blob \| history