Merge commit '145caec5a836be05bfd091f175605bed237516e3'

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

diff --git a/scripts/Makefile b/scripts/Makefile
index a4bfcefb07bdabac7b5f7bf8f49f21a1016fd859..ba99e8efd406081d28424c547e1ae5c8de92ea31 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -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 > "$@"

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index ce08e64fa30fc21047b8ed20835efe99733f7fe8..fd5f8f51921afbd225fd965842cf301f4b60326b 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -24,6 +24,7 @@ map_glowplant
 map_leave_em_behind
 map_lightspeed
 map_newtonian-nightmare
+map_oilrig
 map_red-planet
 map_silentsiege
 map_solarium