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: 9d7405a 0c05be9)

author	Lyberta <lyberta@lyberta.net>
	Sat, 2 Sep 2017 19:47:23 +0000 (22:47 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Sat, 2 Sep 2017 19:47:23 +0000 (22:47 +0300)
commit	0d251c30000872ae53350ce086cbf7116b9c2f33
tree	ceaddf2f46504fd50015a6e7fdf170816856936a	tree \| snapshot
parent	9d7405a0a0b44d5f6807becbf02f01f60ae77033	commit \| diff
parent	0c05be988563ee520ce58439e63cee55ea41d413	commit \| diff

Merged GunGame.

17 files changed:

maps/afterslime.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/atelier.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/boil.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/darkzone.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/drain.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/erbium.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/finalrage.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/fuse.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/glowplant.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/implosion.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/oilrig.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/runningman.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/warfare.mapinfo	diff1 \|	diff2 \|	blob \| history
maps/xoylent.mapinfo	diff1 \|	diff2 \|	blob \| history