diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-06-23 18:01:23 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-06-23 18:02:45 +0100 |
commit | 5a4342cb2ecfc8a2f4a3868a5ba66c79fbe07d5e (patch) | |
tree | 4e7ffecf8c5fd29390621fedde619b7734d2b08d | |
parent | 6e4579b32be125cab74d4ad2014fda201d6531c1 (diff) | |
download | poky-5a4342cb2ecfc8a2f4a3868a5ba66c79fbe07d5e.tar.gz |
qemu: fix sloppy merge
Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r-- | meta/packages/qemu/qemu_0.12.4.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/packages/qemu/qemu_0.12.4.bb b/meta/packages/qemu/qemu_0.12.4.bb index f1ecf3c067..79b0749f32 100644 --- a/meta/packages/qemu/qemu_0.12.4.bb +++ b/meta/packages/qemu/qemu_0.12.4.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "\ | |||
13 | file://fix-dirent.patch \ | 13 | file://fix-dirent.patch \ |
14 | file://fix-nogl.patch \ | 14 | file://fix-nogl.patch \ |
15 | file://qemugl-allow-glxcontext-release.patch \ | 15 | file://qemugl-allow-glxcontext-release.patch \ |
16 | file://linker-flags.patch" | 16 | file://linker-flags.patch \ |
17 | file://init-info.patch;patch=1" | 17 | file://init-info.patch" |
18 | 18 | ||
19 | S = "${WORKDIR}/qemu-${PV}" | 19 | S = "${WORKDIR}/qemu-${PV}" |