# HG changeset patch
# User Ritor1
# Date 1355974007 -21600
# Node ID 48f9a1ac837695993d835dcf81a2bb0d5e62b66b
# Parent  705a6c270835fc4789ebedc2eabcb4a86a4abbe6# Parent  80201f210d422c741bc87871c3e4a2bd0f863bd7
Слияние

diff -r 80201f210d42 -r 48f9a1ac8376 VideoPlayer.cpp
--- a/VideoPlayer.cpp	Thu Dec 20 00:35:15 2012 +0600
+++ b/VideoPlayer.cpp	Thu Dec 20 09:26:47 2012 +0600
@@ -886,7 +886,6 @@
 
   return nullptr;
 }
-
 //----- (004BF1E6) --------------------------------------------------------
 _SMACK *VideoPlayer::OpenSmack(const char *pFilename)
 {