# HG changeset patch
# User Ritor1
# Date 1361624834 -21600
# Node ID ac6039b9ab5bf3507a39bd30a264bdc636ee8b27
# Parent  89f0edd8adbfad7c13d2d97e848ed7b0683343c0# Parent  bbd8888534dca498b32e8447eb3666fe63292c72
Слияние

diff -r bbd8888534dc -r ac6039b9ab5b GUIWindow.cpp
--- a/GUIWindow.cpp	Sat Feb 23 16:02:04 2013 +0200
+++ b/GUIWindow.cpp	Sat Feb 23 19:07:14 2013 +0600
@@ -1016,7 +1016,6 @@
 }
 // 50640C: using guessed type int dword_50640C[];
 
-
 //----- (004B3157) --------------------------------------------------------
 void GUIWindow::HouseDialogManager()
 {