From: Vlad <vlad@gas.by>
Date: Wed, 11 Aug 2010 11:26:19 +0000 (+0300)
Subject: Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
X-Git-Url: http://vcs.maemo.org/git/?p=xscreensaver;a=commitdiff_plain;h=c213fefddba7a483e7c076932aea88c096f084a4

Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

Conflicts:
	xscreensaver/hacks/screenhack.c
---

c213fefddba7a483e7c076932aea88c096f084a4
diff --cc xscreensaver/hacks/screenhack.c
index cad0b74,8414e54..799bf84
--- a/xscreensaver/hacks/screenhack.c
+++ b/xscreensaver/hacks/screenhack.c
@@@ -633,10 -682,12 +682,16 @@@ run_screenhack_table (Display *dpy
            (view == 4 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW4))){
             fprintf(stderr, "Play scene visible %i\n", view); 
  	   pause = 0;
 -	   dbus_message_unref (msg);
 +	   dbus_message_unref (msg); 
  	   continue;
        }
++<<<<<<< HEAD
 +      dbus_message_unref (msg); 
++=======
+ */
+       
+       /*dbus_message_unref (msg);*/
++>>>>>>> 392e81dc1f7b4a895b1838457380c376a80f9186
      }
  
    ft->free_cb (dpy, window, closure);