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/xorg-app/xrandr_1.2.2.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/xorg-app/xrandr_1.2.2.bb')
| -rw-r--r-- | recipes/xorg-app/xrandr_1.2.2.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/xorg-app/xrandr_1.2.2.bb b/recipes/xorg-app/xrandr_1.2.2.bb index 28e439400d..bac668e12c 100644 --- a/recipes/xorg-app/xrandr_1.2.2.bb +++ b/recipes/xorg-app/xrandr_1.2.2.bb @@ -5,7 +5,7 @@ LICENSE= "BSD-X" DEPENDS += "libxrandr libxrender" PE = "1" -SRC_URI += "file://resolve_symbol_clash.patch;patch=1" +SRC_URI += "file://resolve_symbol_clash.patch" SRC_URI[archive.md5sum] = "c6ec9dc42396e3b3a2da932f3feca6ec" SRC_URI[archive.sha256sum] = "632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303" |