From: Mario <mario.mario@y7mail.com>
Date: Thu, 27 Nov 2014 03:56:15 +0000 (+1100)
Subject: Merge branch 'master' into Mirio/drain
X-Git-Tag: xonotic-v0.8.0~18^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=f345f94923129fb070025ac04ec4e16cd55978b3;hp=f167a631c3356f9a44507874dfe04a0f1a35429e

Merge branch 'master' into Mirio/drain
---

diff --git a/maps/drain.map b/maps/drain.map
index ea33fc40..417e7ac5 100644
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -1038,7 +1038,7 @@
 ( -592 248 -64 ) ( -576 240 -64 ) ( -592 248 64 ) phillipk1x/floors-pk01_floor01a 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -652 276 128 ) ( -588 276 128 ) ( -652 244 128 ) common/caulk 48 48 90 0.25 0.25 0 0 0
+( -652 276 128 ) ( -588 276 128 ) ( -652 244 128 ) phillipk1x/floors-pk01_floor01a 48 48 90 0.25 0.25 0 0 0
 ( -652 276 128 ) ( -652 244 128 ) ( -652 276 0 ) phillipk1x/floors-pk01_floor01a 48 0 0 0.25 0.25 0 0 0
 ( -652 260 128 ) ( -652 260 0 ) ( -588 260 128 ) phillipk1x/trim-pk01_door01a 208 0 0 -0.25 0.25 0 0 0
 ( -588 244 0 ) ( -588 276 0 ) ( -652 244 0 ) common/caulk 48 48 90 0.25 0.25 0 0 0
@@ -1061,7 +1061,7 @@
 ( -592 392 64 ) ( -576 400 -64 ) ( -592 392 -64 ) phillipk1x/floors-pk01_floor01a 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -588 364 128 ) ( -652 364 128 ) ( -588 396 128 ) common/caulk 48 208 -90 0.25 0.25 0 0 0
+( -588 364 128 ) ( -652 364 128 ) ( -588 396 128 ) phillipk1x/floors-pk01_floor01a 48 208 -90 0.25 0.25 0 0 0
 ( -588 364 128 ) ( -588 396 128 ) ( -588 364 0 ) phillipk1x/floors-pk01_floor01a 48 0 0 -0.25 0.25 0 0 0
 ( -588 380 128 ) ( -588 380 0 ) ( -652 380 128 ) phillipk1x/trim-pk01_door01a 208 0 0 -0.25 0.25 0 0 0
 ( -652 396 0 ) ( -652 364 0 ) ( -588 396 0 ) common/caulk 48 208 -90 0.25 0.25 0 0 0