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

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

author	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Tue, 19 Apr 2011 21:56:26 +0000 (00:56 +0300)
committer	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Tue, 19 Apr 2011 21:56:26 +0000 (00:56 +0300)
commit	bccfb396e18cb0cd10ec150263d892415a23e3f3
tree	81bf7490762d4089bf218160dc0e12c8685d6d1f	tree \| snapshot
parent	db9ea3663a9a30a73fd9717f99ae883c59786139	commit \| diff
parent	396be1f0fd806ebca957a7a065d6934a8e85e0c9	commit \| diff

Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load