# HG changeset patch
# User Ritor1
# Date 1363922085 -21600
# Node ID e0a8cc28caeb56cc6853a0f8c5babdd1803fb563
# Parent  7378398c34e42c2bee41aaf7379e22827b5f4b59# Parent  8323734d58c80aee25860a3a13993240552cc7d6
Слияние

diff -r 8323734d58c8 -r e0a8cc28caeb mm7_3.cpp
--- a/mm7_3.cpp	Fri Mar 22 00:27:11 2013 +0200
+++ b/mm7_3.cpp	Fri Mar 22 09:14:45 2013 +0600
@@ -493,7 +493,6 @@
 }
 
 
-
 //----- (0046ED1B) --------------------------------------------------------
 int _46ED1B_collide_against_floor(int x, int y, int z, unsigned int *pSectorID, unsigned int *pFaceID)
 {