# HG changeset patch
# User Ritor1
# Date 1359432187 -21600
# Node ID 3f2d5c80e162227414b50a0ebcdb4f7cd18f584f
# Parent  3b2fbcf8d9cc01db112d606808d5b96e260bf7da# Parent  d56c131462858f9a81e16fe474a1e881c30b2b91
Слияние

diff -r d56c13146285 -r 3f2d5c80e162 Game.cpp