# HG changeset patch
# User Ritor1
# Date 1361291878 -21600
# Node ID 72de4ad353c64c952a34b70aba6390c711a79cd6
# Parent  2503214e52582b670869466457063815166c7174# Parent  f16ac5e654387be26eb78deaa246b928b3e49cd6
Слияние

diff -r f16ac5e65438 -r 72de4ad353c6 Player.cpp