[SCM] lives/master.experimental: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 15d96df291cef5cead8b75e4ab7fb0348f44dd31
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 29 15:21:24 2012 +0000

    Refresh

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index 9da28fe..369e031 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -110,7 +110,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    gtk_widget_set_sensitive (mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
 --- lives.orig/src/main.h
 +++ lives/src/main.h
-@@ -624,7 +624,7 @@ typedef struct {
+@@ -626,7 +626,7 @@ typedef struct {
    gboolean has_convert;
    gboolean has_composite;
    gboolean has_identify;

-- 
lives packaging