[SCM] mixxx/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit deeb02a53f4be852447d1fafba93dff646fe5fb6
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Sep 18 11:17:05 2010 +0200

    Refresh

diff --git a/debian/patches/20_norpath.patch b/debian/patches/20_norpath.patch
index 899cfbe..0929b17 100644
--- a/debian/patches/20_norpath.patch
+++ b/debian/patches/20_norpath.patch
@@ -1,8 +1,10 @@
-diff --git a/src/SConscript b/src/SConscript
-index d1db9e7..f809c70 100755
---- a/src/SConscript
-+++ b/src/SConscript
-@@ -737,9 +737,6 @@ if 'win' in platform:
+---
+ src/SConscript |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- mixxx.orig/src/SConscript
++++ mixxx/src/SConscript
+@@ -759,9 +759,6 @@ if 'win' in platform:
  else:
  	env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
  	env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))

-- 
mixxx packaging