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: 5262562 c91f592)

author	FruitieX <fruitiex@gmail.com>
	Wed, 24 Nov 2010 19:44:41 +0000 (21:44 +0200)
committer	FruitieX <fruitiex@gmail.com>
	Wed, 24 Nov 2010 19:44:41 +0000 (21:44 +0200)
commit	136bde75f76430926f45692fc783f12f053c3b1e
tree	7a2eea5da72dc2fa5e87ef598b821146448ebb31	tree \| snapshot
parent	526256220aa1c46ff61799f2ca68a33b1451b503	commit \| diff
parent	c91f592638f0707cac8a8966b0c79149abb17fa4	commit \| diff

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

Conflicts:
defaultXonotic.cfg

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_physics.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