# HG changeset patch
# User Ritor1
# Date 1361371915 -21600
# Node ID 405d0c4dd1b3e319448963fa7270323817da9b7d
# Parent  e8fcde8ba3fcacd8870a60c283589d98c84d0887# Parent  8e23edf57e27f86aa100ab83e9695f7d3c241edb
Слияние

diff -r 8e23edf57e27 -r 405d0c4dd1b3 Player.cpp
diff -r 8e23edf57e27 -r 405d0c4dd1b3 mm7_5.cpp