# HG changeset patch
# User Ritor1
# Date 1360947533 -21600
# Node ID f9cfc1867efde5b35d3d5c1fc8e50373434157af
# Parent  e50a810606547b00bceababd9ec4933f63355f72# Parent  d65528fc3bda427a8be8597053949f97de2777b8
Слияние

diff -r d65528fc3bda -r f9cfc1867efd AudioPlayer.cpp
--- a/AudioPlayer.cpp	Fri Feb 15 19:53:40 2013 +0200
+++ b/AudioPlayer.cpp	Fri Feb 15 22:58:53 2013 +0600
@@ -737,7 +737,7 @@
   int v102; // [sp+90h] [bp+1Ch]@60
   int v103; // [sp+90h] [bp+1Ch]@68
 
-  uVolume = 120; //Ritor1:It's temporary
+  //uVolume = 120; //Ritor1:It's temporary
   pAudioPlayer = this;
   v35 = this->bPlayerReady == 0;
   //pAudioPlayer = this;