# HG changeset patch
# User Ritor1
# Date 1356324615 -21600
# Node ID 222a09fccca1e5f8cb1ecfe6ae4bc2958f3ab80c
# Parent  269ca53dae41aa54536a2c91602553a4ba734007# Parent  d7bd52a35e520977cd95def6fc5a5a3ae0ce4fd4
Слияние

diff -r d7bd52a35e52 -r 222a09fccca1 Player.cpp
--- a/Player.cpp	Mon Dec 24 07:48:44 2012 +0600
+++ b/Player.cpp	Mon Dec 24 10:50:15 2012 +0600
@@ -740,7 +740,6 @@
   return v3;
 }
 
-
 //----- (0049327B) --------------------------------------------------------
 int Player::_49327B(unsigned int uClass, int a3)
 {