]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 6f05fa7)
Merge branch 'diabolik/afterslime' of ssh://git.xonotic.org/xonotic-maps.pk3dir into...
authorssinghal <dib.diabolik@gmail.com>
Sun, 6 Mar 2011 21:00:58 +0000 (16:00 -0500)
committerssinghal <dib.diabolik@gmail.com>
Sun, 6 Mar 2011 21:00:58 +0000 (16:00 -0500)
Conflicts:
maps/afterslime.mapinfo
maps/afterslime.waypoints

maps/afterslime.jpg patch | blob | history
maps/afterslime.mapinfo patch | blob | history

diff --git a/maps/afterslime.jpg b/maps/afterslime.jpg
index 7db8a34737e707371bfc5746c06a7e9080dcfac3..d9e688a59687cc7554de1723492dccf7c3d0363f 100644 (file)
Binary files a/maps/afterslime.jpg and b/maps/afterslime.jpg differ
diff --git a/maps/afterslime.mapinfo b/maps/afterslime.mapinfo
index 42739915ceb56cc19100c314d65de4ecc08939d3..2905d8ea07b5c60d259fc0dbc90ccc90b221d051 100644 (file)
--- a/maps/afterslime.mapinfo
+++ b/maps/afterslime.mapinfo
@@ -1,7 +1,11 @@
 title Afterslime
 description Medium sized indoor deathmatch map
 author kuniu the frogg
+<<<<<<< HEAD
 cdtrack 3
+=======
+cdtrack 8
+>>>>>>> c5a920af43cfefb3bf459078dce4da8285724de0
 has weapons
 gametype dm
 gametype tdm