Merge commit '145caec5a836be05bfd091f175605bed237516e3'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 8 Jul 2013 09:56:30 +0000 (11:56 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 8 Jul 2013 09:56:30 +0000 (11:56 +0200)
maps/afterslime.jpg [deleted file]
maps/leave_em_behind.jpg [deleted file]
maps/red-planet.jpg [deleted file]
maps/runningman.jpg [deleted file]
maps/runningmanctf.jpg [deleted file]
maps/stormkeep.jpg [deleted file]
maps/techassault.jpg [deleted file]
scripts/Makefile
scripts/shaderlist.txt

diff --git a/maps/afterslime.jpg b/maps/afterslime.jpg
deleted file mode 100644 (file)
index d9e688a..0000000
Binary files a/maps/afterslime.jpg and /dev/null differ
diff --git a/maps/leave_em_behind.jpg b/maps/leave_em_behind.jpg
deleted file mode 100644 (file)
index ad03b33..0000000
Binary files a/maps/leave_em_behind.jpg and /dev/null differ
diff --git a/maps/red-planet.jpg b/maps/red-planet.jpg
deleted file mode 100644 (file)
index 8f6dd71..0000000
Binary files a/maps/red-planet.jpg and /dev/null differ
diff --git a/maps/runningman.jpg b/maps/runningman.jpg
deleted file mode 100644 (file)
index a00ff3d..0000000
Binary files a/maps/runningman.jpg and /dev/null differ
diff --git a/maps/runningmanctf.jpg b/maps/runningmanctf.jpg
deleted file mode 100644 (file)
index f7b394f..0000000
Binary files a/maps/runningmanctf.jpg and /dev/null differ
diff --git a/maps/stormkeep.jpg b/maps/stormkeep.jpg
deleted file mode 100644 (file)
index 3a158cb..0000000
Binary files a/maps/stormkeep.jpg and /dev/null differ
diff --git a/maps/techassault.jpg b/maps/techassault.jpg
deleted file mode 100644 (file)
index 330b83d..0000000
Binary files a/maps/techassault.jpg and /dev/null differ
index a4bfcef..ba99e8e 100644 (file)
@@ -7,7 +7,8 @@ all: shaderlist.txt $(GENERATEDFILES)
        ./shader-cpp.sh "$<" > "$@"
 
 clean:
-       $(RM) "$(GENERATEDFILES)"
+       $(RM) $(GENERATEDFILES)
 
+.PHONY: shaderlist.txt
 shaderlist.txt:
        ls -1 *.shader | cut -d . -f 1 > "$@"
index ce08e64..fd5f8f5 100644 (file)
@@ -24,6 +24,7 @@ map_glowplant
 map_leave_em_behind
 map_lightspeed
 map_newtonian-nightmare
+map_oilrig
 map_red-planet
 map_silentsiege
 map_solarium