# HG changeset patch
# User Ritor1
# Date 1368013005 -21600
# Node ID e875f5ab0cfb14084af5cf65386b0d36bdfa350f
# Parent  8a6b995a84a5c65d4c33390d91454e02cd729ee8# Parent  35f2e900618ef7f195ccb94d68ccd51e5a39dd40
Слияние

diff -r 35f2e900618e -r e875f5ab0cfb UIPartyCreation.cpp
diff -r 35f2e900618e -r e875f5ab0cfb mm7_5.cpp