# HG changeset patch
# User Ritor1
# Date 1394733397 -21600
# Node ID 85296dca37cfba032d582b5de9028fc563d6b944
# Parent  7ffddbe09e5592644b1b4785c82208b0ddfcb0b2# Parent  f18dd2d1b56877330b3eea45ed63159b7dfe5ff7
Слияние

diff -r 7ffddbe09e55 -r 85296dca37cf Items.cpp
--- a/Items.cpp	Thu Mar 13 23:56:31 2014 +0600
+++ b/Items.cpp	Thu Mar 13 23:56:37 2014 +0600
@@ -566,7 +566,7 @@
 	strtok(NULL, "\r");
 	strtok(NULL, "\r");
 	strtok(NULL, "\r");
-  for (int item_counter = 0; item_counter < 619; item_counter++)
+  for (item_counter = 0; item_counter < 619; item_counter++)
 		{
 		test_string = strtok(NULL, "\r") + 1;
     auto tokens = Tokenize(test_string, '\t');