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: 6466744 72ab054)

author	FruitieX <fruitiex@gmail.com>
	Mon, 20 Dec 2010 13:39:54 +0000 (15:39 +0200)
committer	FruitieX <fruitiex@gmail.com>
	Mon, 20 Dec 2010 13:39:54 +0000 (15:39 +0200)
commit	cd69929f60e2df88000c2558629ce650204aca26
tree	f33544f003200b0637aeea9bd5275a3b63d390a7	tree \| snapshot
parent	6466744922d3260fd843212f818c7562abf7b43b	commit \| diff
parent	72ab0540e65d8296d4d62c056f099c82bb815868	commit \| diff

Merge remote branch 'origin/divVerent/virtual-mirror-damage' into fruitiex/hud_damage-dmg_take

defaultXonotic.cfg