# HG changeset patch
# User Ritor1
# Date 1362972537 -21600
# Node ID f6aeea3eb89353b914965517ff9823a417aec229
# Parent  f234b67a9caf20d4890e39e255f8f5b6732d7e0f# Parent  3d03a3a674bcf852548be59c36a2f0f6689efd37
Слияние

diff -r 3d03a3a674bc -r f6aeea3eb893 mm7_3.cpp
--- a/mm7_3.cpp	Mon Mar 11 03:38:59 2013 +0200
+++ b/mm7_3.cpp	Mon Mar 11 09:28:57 2013 +0600
@@ -11696,7 +11696,6 @@
       &pIcons_LOD->pTextures[dword_50C98C]);
 }
 
-
 //----- (004415C5) --------------------------------------------------------
 void LoadPartyBuffIcons()
 {