diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-22 22:33:26 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-22 22:38:30 +0200 |
commit | 53bfb2398c16d2065ffa2bc6cd34c83e15347014 (patch) | |
tree | 3793fb7c6cb4799ec2c029b433636cb60fe7625b /packages/xorg-lib/libx11_git.bb | |
parent | 576cfbfba8880ea4421369d35236c696188b144d (diff) | |
parent | 245f7d129f3dba351b3c8ef284df69a86261904c (diff) |
Merge branch 'shared/file-pr-revert' into org.openembedded.dev
Conflicts:
packages/busybox/busybox_1.11.3.bb
packages/dsplink/codec-engine_2.10.bb
packages/gdb/gdb_6.3.bb
packages/gdb/gdb_6.4.bb
packages/gdb/gdb_6.6.bb
packages/gdb/gdb_6.8.bb
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.3.6.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/kexecboot/linux-kexecboot_2.6.26.bb
packages/libsdl/libsdl-x11_1.2.11.bb
packages/linux/linux-rp_2.6.26.bb
packages/mozilla/fennec_hg.bb
packages/python/python_2.5.2.bb
packages/tasks/task-xfce-base.bb
packages/xorg-driver/xf86-video-omapfb_git.bb
packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
Diffstat (limited to 'packages/xorg-lib/libx11_git.bb')
-rw-r--r-- | packages/xorg-lib/libx11_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb index 2622accafe..f2929624e8 100644 --- a/packages/xorg-lib/libx11_git.bb +++ b/packages/xorg-lib/libx11_git.bb @@ -6,7 +6,7 @@ LICENSE = "XFree86" DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" PROVIDES = "virtual/libx11" RPROVIDES = "virtual/libx11" -FILE_PR = "r1" +PR = "r1" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" |