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

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

projects / xonotic / xonotic-maps.pk3dir.git / commit

author	Rudolf Polzer <rpolzer@grawp.(none)>
	Fri, 2 Apr 2010 19:16:02 +0000 (21:16 +0200)
committer	Rudolf Polzer <rpolzer@grawp.(none)>
	Fri, 2 Apr 2010 19:16:02 +0000 (21:16 +0200)
commit	d5ef7cdf0f297cb8ddfc995153b334e323b6c121
tree	191c4529816af3184d6cb6c2ad55b415dcd72b31	tree \| snapshot
parent	61ec8683ff81fde240ebfbe36133f93d90e3d69b	commit \| diff
parent	83f2274c32423846ab92989d04785bce6152e456	commit \| diff

Merge branch 'm0rfar/wtf'

Conflicts:
env/exosystem/exosystem2_bk.tga
env/exosystem/exosystem2_dn.tga
env/exosystem/exosystem2_ft.tga
env/exosystem/exosystem2_lf.tga
env/exosystem/exosystem2_preview.png
env/exosystem/exosystem2_rt.tga
env/exosystem/exosystem2_up.tga
env/exosystem/exosystem_bk.tga
env/exosystem/exosystem_dn.tga
env/exosystem/exosystem_ft.tga
env/exosystem/exosystem_lf.tga
env/exosystem/exosystem_preview.png
env/exosystem/exosystem_rt.tga
env/exosystem/exosystem_up.tga

RSS Atom