git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

author	FruitieX <rasse@rasse-laptop.(none)>
	Tue, 5 Oct 2010 16:28:44 +0000 (19:28 +0300)
committer	FruitieX <rasse@rasse-laptop.(none)>
	Tue, 5 Oct 2010 16:28:44 +0000 (19:28 +0300)
commit	0b477ef3d8dde4db94a9600c10d8f789ab2794b7
tree	d1e6d2589a28e36923bf16008ee1b6cf4fae9e82	tree \| snapshot
parent	3a234f16cd5087efe530c593dcc19b7c8c4d4647	commit \| diff
parent	f025ee01d4818d9360f0e1344f6ac7ae56ac423a	commit \| diff

Merge remote branch 'origin/mirceakitsune/weapon_mine_layer' into fruitiex/fruitbalance