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
(merge: 5d790a4 b228dbb)

author	Lyberta <lyberta@lyberta.net>
	Sun, 2 Apr 2017 08:22:42 +0000 (11:22 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Sun, 2 Apr 2017 08:22:42 +0000 (11:22 +0300)
commit	44548c56265b276050d0539445e042c1b4a17ce9
tree	d7cb2fc6e1b5db9230c0a4a270995892079f4a58	tree \| snapshot
parent	5d790a4b84b4726b31afa8cc5d26d30817d8708d	commit \| diff
parent	b228dbbe38b435312130660a713be6073173c0f6	commit \| diff

Merged master.

13 files changed:

maps/atelier.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/boil.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/courtfun.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/dance.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/darkzone.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/fuse.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/implosion.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/runningman.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/runningmanctf.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/silentsiege.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/solarium.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/stormkeep.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/xoylent.mapinfo	diff1 \|	diff2 \|	blob \| history