# HG changeset patch
# User Ritor1
# Date 1353296492 -21600
# Node ID 1b7ca63e472e29574d35556ee544d16711844707
# Parent  dac041fc74e812ad93b664afc88f2f9a531e12e7# Parent  4e1e3fe8502f38d3b39705ebb4f4139be853d044
Слияние

diff -r 4e1e3fe8502f -r 1b7ca63e472e Party.cpp