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: 6f485c3 7620bad)

author	FruitieX <fruitiex@gmail.com>
	Tue, 30 Nov 2010 13:56:46 +0000 (15:56 +0200)
committer	FruitieX <fruitiex@gmail.com>
	Tue, 30 Nov 2010 13:56:46 +0000 (15:56 +0200)
commit	26c8963b7747f4c53fc541df0dd71b7024d1d496
tree	8bcf9baa54dd6a66f9a6a16de28fd000396e059d	tree \| snapshot
parent	6f485c3b5ba5ac9d7762c399a9464ab3f5b469d6	commit \| diff
parent	7620bad4093b6d83eb360cd6c9dd80e5cb5a2a1a	commit \| diff

Merge remote branch 'origin/master' into fruitiex/gamemode_freezetag

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	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/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_electro.qc	diff1 \|	diff2 \|	blob \| history