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

summary | shortlog | log | commit | commitdiff | tree
(merge: dd1c17f f3cd6e8)

author	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Thu, 25 Aug 2011 12:36:41 +0000 (15:36 +0300)
committer	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Thu, 25 Aug 2011 12:36:41 +0000 (15:36 +0300)
commit	f2a79cba0897fb6f6cb7ebeecb596b5547af3ddd
tree	b8caf30f6bbb7b5c35d9e50b8428d19168699754	tree \| snapshot
parent	dd1c17f2775c0249509992ee85edb71020fa09e9	commit \| diff
parent	f3cd6e8e994c399d573bf829b43ef04efb6d1a67	commit \| diff

Merge branch 'master' into mirceakitsune/damage_effects

Conflicts:
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/gibs.qc

12 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
effectinfo.txt	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/gibs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.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_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/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history