# HG changeset patch
# User Ritor1
# Date 1377756295 -21600
# Node ID 223605b325b3a06062ee4f2db84722f7d04e5b2a
# Parent  cfd99b6177a3bc48300160fc7a626032b6136e66# Parent  0356a84be1cf5d9d98e0821b86787930caab292d
Слияние

diff -r 0356a84be1cf -r 223605b325b3 UI/UICharacter.cpp