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

summary | shortlog | log | commit | commitdiff | tree
(parent: 5b02c68) | patch

author	Mirio <opivy@hotmail.de>
	Thu, 30 Nov 2017 19:48:22 +0000 (20:48 +0100)
committer	Mirio <opivy@hotmail.de>
	Thu, 30 Nov 2017 19:48:22 +0000 (20:48 +0100)
commit	b9fd6ca1cf04e3076dae9ab4c5d1b61ccfdf55e0
tree	4cff5eeee156dc9b83e1178c562b026716d83b3f	tree \| snapshot
parent	5b02c689d27568af86dad1b75b84a834681e4529	commit \| diff

merge master

maps/boil.map		diff \| blob \| history
maps/boil.map.options		diff \| blob \| history
maps/implosion.map		diff \| blob \| history
maps/implosion.map.options		diff \| blob \| history
maps/implosion.mapinfo		diff \| blob \| history
maps/stormkeep.map		diff \| blob \| history
maps/stormkeep.map.options		diff \| blob \| history
maps/stormkeep.rtlights	[deleted file]	blob \| history
scripts/entities.ent		diff \| blob \| history