# HG changeset patch
# User Ritor1
# Date 1366687102 -21600
# Node ID 9efbe4bff7ac0f97cf7afcf6c84a89020a5f895e
# Parent  d5d418a29cfe8891c07a7e130f85c0485c608c20# Parent  a8a3efd631de0540f39305d80fb66e1ec5248516
Слияние

diff -r a8a3efd631de -r 9efbe4bff7ac UICharacter.cpp
--- a/UICharacter.cpp	Mon Apr 22 21:29:21 2013 +0600
+++ b/UICharacter.cpp	Tue Apr 23 09:18:22 2013 +0600
@@ -2401,7 +2401,6 @@
       }
     }
   }
-
   memset(byte_5111F6, 0, 16);
   for (uint i = 0; i < 4; ++i)
   {