# HG changeset patch
# User Ritor1
# Date 1354204858 -21600
# Node ID 6386d105011a239f67f13a8cb5b57d375b203606
# Parent  2cc68f234b29f7b5a7a1a6a780271cd292cda912# Parent  60bb9d93c097d03119e218e4202d6510c22dc3ca
Слияние

diff -r 60bb9d93c097 -r 6386d105011a Party.cpp