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	Samual Lenks <samual@xonotic.org>
	Wed, 13 Feb 2013 17:09:46 +0000 (12:09 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Wed, 13 Feb 2013 17:09:46 +0000 (12:09 -0500)
commit	54f4843b201d2b22942457df5b50ddc0c48ed8d2
tree	974f593f168e51382ea8569a626c88264315c8c1	tree \| snapshot
parent	e7c63b4a159ba5bed1a4e35d1df9ca19cdef95a2	commit \| diff
parent	7db04867a8db785347bec7d49890c0e70a0df2bc	commit \| diff

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

Conflicts:
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/w_fireball.qc
qcsrc/server/w_rifle.qc
qcsrc/server/w_tuba.qc

23 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/deathtypes.qh	diff1 \|	\|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	\|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.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/vehicles/spiderbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minstanex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_shotgun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_uzi.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/deathtypes.qh	diff1 \|	\|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	\|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.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/vehicles/spiderbot.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minstanex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_rifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_shotgun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_uzi.qc	diff1 \|	diff2 \|	blob \| history