changeset 880:4568f1e4d61b

Слияние
author Ritor1
date Mon, 01 Apr 2013 18:52:19 +0600
parents cd355e4c6104 (diff) 726f9c2ff381 (current diff)
children 1d7e7d61485b
files mm7_3.cpp
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_3.cpp	Mon Apr 01 12:56:34 2013 +0100
+++ b/mm7_3.cpp	Mon Apr 01 18:52:19 2013 +0600
@@ -6684,7 +6684,6 @@
   LOBYTE(v2->field_2) |= 0x20u;
   return v1;
 }
-
 //----- (0047BC6F) --------------------------------------------------------
 unsigned __int16 *__fastcall GetBillboardPalette(RenderBillboard *a1, int a2, signed int a3, int a4)
 {