diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/cdparanoia/cdparanoia_9.8alpha.bb | |
parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/cdparanoia/cdparanoia_9.8alpha.bb')
-rw-r--r-- | recipes/cdparanoia/cdparanoia_9.8alpha.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/cdparanoia/cdparanoia_9.8alpha.bb b/recipes/cdparanoia/cdparanoia_9.8alpha.bb index 34e249087a..9d082a9c06 100644 --- a/recipes/cdparanoia/cdparanoia_9.8alpha.bb +++ b/recipes/cdparanoia/cdparanoia_9.8alpha.bb @@ -6,8 +6,8 @@ LICENSE = "GPL" PR = "r3" SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \ - file://fixes.patch;patch=1 \ - file://Makefile.patch;patch=1" + file://fixes.patch \ + file://Makefile.patch" S = "${WORKDIR}/cdparanoia-III-alpha9.8" |