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: cd69929 9af625c)

author	FruitieX <fruitiex@gmail.com>
	Mon, 20 Dec 2010 14:04:31 +0000 (16:04 +0200)
committer	FruitieX <fruitiex@gmail.com>
	Mon, 20 Dec 2010 14:04:31 +0000 (16:04 +0200)
commit	bb83fecdaaa8366c8eefda25743b0958ca129fb4
tree	4355d75bd010a81e7784d4e28710f1a078bea208	tree \| snapshot
parent	cd69929f60e2df88000c2558629ce650204aca26	commit \| diff
parent	9af625c5b69d892391c2be8f6358b3d263835b82	commit \| diff

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

defaultXonotic.cfg