# HG changeset patch
# User Ritor1
# Date 1364560920 -21600
# Node ID 6f7c2ab9ce4f0e5eaa2b88fcbead6c334b11051d
# Parent  4d312db0730d73a6c58e6e161dc481aa4b901ee5# Parent  2825b5a9b56296b8b45011aa258de9a027a358c2
Слияние

diff -r 2825b5a9b562 -r 6f7c2ab9ce4f Player.cpp
--- a/Player.cpp	Fri Mar 29 10:44:18 2013 +0600
+++ b/Player.cpp	Fri Mar 29 18:42:00 2013 +0600
@@ -8742,7 +8742,6 @@
 }
 
 
-
 //----- (0044AFFB) --------------------------------------------------------
 void Player::AddVariable(enum VariableType var_type, signed int val)
 {