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: a8f44b0 6796c18)

author	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Tue, 3 Jan 2012 19:20:46 +0000 (21:20 +0200)
committer	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Tue, 3 Jan 2012 19:20:46 +0000 (21:20 +0200)
commit	c6c371883dde697e1f237d498c08e09788b6af6b
tree	1cb9746f91a87a8889d7eac77913bd45af6ab2c5	tree \| snapshot
parent	a8f44b0e98aedacaae872b937ee023e24fc30878	commit \| diff
parent	6796c18deac69d942dfc65b88efb2a5d9b258608	commit \| diff

Merge branch 'master' into mirceakitsune/damage_effects

Conflicts:
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/common/constants.qh
qcsrc/server/cl_player.qc

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/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history