Merge remote-tracking branch 'origin/master' into fruitiex/runningmanfix

diff --git a/maps/runningman.mapinfo b/maps/runningman.mapinfo
index 3e9863d2a28877ca57adf297b25a3a5646c5f0fd..f9e5cd4c6a7189e6f37f9ba0b0a2c321c47dd8c4 100644 (file)
--- a/maps/runningman.mapinfo
+++ b/maps/runningman.mapinfo
@@ -6,5 +6,6 @@ has weapons
 gametype dm
 gametype lms
 gametype arena
+gametype kh
 gametype ka
 clientsettemp_for_type all r_water 1

diff --git a/maps/runningmanctf.jpg b/maps/runningmanctf.jpg
index 053103aab40eecbf07d96d86726e35328f1bd4f4..f7b394f10378656065af13bb544fc884a7639028 100644 (file)
Binary files a/maps/runningmanctf.jpg and b/maps/runningmanctf.jpg differ

diff --git a/maps/runningmanctf.mapinfo b/maps/runningmanctf.mapinfo
index e200d1a58dbcaabeb9aeb983ed1ebb82b9cb1af0..ecddc47afff8928d5db9d2c64dda3a41494a852d 100644 (file)
--- a/maps/runningmanctf.mapinfo
+++ b/maps/runningmanctf.mapinfo
@@ -5,7 +5,6 @@ cdtrack 6
 has weapons
 gametype ctf
 gametype ca
-gametype kh
 gametype ons
 gametype dom
 gametype freezetag