# HG changeset patch
# User Ritor1
# Date 1353900924 -21600
# Node ID 20c034b5a6e2a11f50933d5d105b3e09be5f81bf
# Parent  13b2a2cd4552d8740459ac61a2b276f274e4d58e# Parent  38a1c8ef6874879045c17ce3c3d37b6789f57852
Слияние

diff -r 38a1c8ef6874 -r 20c034b5a6e2 Party.cpp
diff -r 38a1c8ef6874 -r 20c034b5a6e2 Render.cpp