# HG changeset patch
# User Ritor1
# Date 1368536708 -21600
# Node ID 3ee391de04d50ea1a479e9625ad426bda22554d8
# Parent  d5796c3186533a90abc4562a854c0d5bae5edce7# Parent  53109a1455fc7bd7f7356107a61a22c150dd0145
Слияние

diff -r 53109a1455fc -r 3ee391de04d5 UICharacter.cpp