# HG changeset patch
# User Ritor1
# Date 1364995982 -21600
# Node ID addae461eeb49ee74f86c4a513d83d3e154d5a3d
# Parent  2fe7bcaa52e4f4665a60ead3ef623ee9b437333b# Parent  df0ffbb70cc6133aea3c3edf5153c1924865d820
Слияние

diff -r df0ffbb70cc6 -r addae461eeb4 Items.cpp
--- a/Items.cpp	Wed Apr 03 14:52:15 2013 +0600
+++ b/Items.cpp	Wed Apr 03 19:33:02 2013 +0600
@@ -307,7 +307,6 @@
   pItemsTXT_Raw = NULL;
 }
 
-
 //----- (00456D84) --------------------------------------------------------
 void ItemsTable::Initialize()
 	{
diff -r df0ffbb70cc6 -r addae461eeb4 UIHouses.cpp