# HG changeset patch
# User Ritor1
# Date 1369127838 -21600
# Node ID a85f5cb295b72cf9f29a6372d6ac0a127d3eed2d
# Parent  b725a9cdec0cce319be5fdbf2c61fc53ca6f6424# Parent  c94d6a37d298d24880ece7667019a4d2cf4bcc33
Слияние

diff -r c94d6a37d298 -r a85f5cb295b7 Player.cpp
--- a/Player.cpp	Tue May 21 12:10:08 2013 +0200
+++ b/Player.cpp	Tue May 21 15:17:18 2013 +0600
@@ -7683,8 +7683,6 @@
 
     }
 
-
-
 //----- (00449BB4) --------------------------------------------------------
 bool Player::CompareVariable( enum VariableType VarNum, signed int pValue )
 	{