# HG changeset patch
# User Ritor1
# Date 1356014147 -21600
# Node ID 27bdff4ed3e665b5c7d05dacf6339d7abd9b4888
# Parent  4436fa7011626d09077dcb734d870cdefa8ceda5# Parent  0a0eb74e8e9511695fe59effe1018e6f4cf506be
Слияние

diff -r 0a0eb74e8e95 -r 27bdff4ed3e6 VideoPlayer.cpp
--- a/VideoPlayer.cpp	Thu Dec 20 17:29:36 2012 +0600
+++ b/VideoPlayer.cpp	Thu Dec 20 20:35:47 2012 +0600
@@ -995,7 +995,6 @@
   }
 }
 
-
 //----- (004BF3F9) --------------------------------------------------------
 bool VideoPlayer::AnyMovieLoaded()
 {