[vlc-devel] commit: Qt4: compile fix. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Oct 15 10:30:04 2008 +0200| [e3db765137abde9ae995e532fa86dda512e59644] | committer: Jean-Baptiste Kempf 

Qt4: compile fix.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e3db765137abde9ae995e532fa86dda512e59644
---

 modules/gui/qt4/qt4.cpp |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 39d58d8..ac00b62 100755
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -264,11 +264,7 @@ static int Open( vlc_object_t *p_this )
     /* Access to the playlist */
     p_intf->p_sys->p_playlist = pl_Hold( p_intf );
     /* Listen to the messages */
-<<<<<<< Updated upstream:modules/gui/qt4/qt4.cpp
     //p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_libvlc, NULL, NULL );
-=======
-    //p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
->>>>>>> Stashed changes:modules/gui/qt4/qt4.cpp
     /* one settings to rule them all */
 
     var_Create( p_this, "window_widget", VLC_VAR_ADDRESS );