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/wxwidgets | |
| 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/wxwidgets')
| -rw-r--r-- | packages/wxwidgets/wxbase_2.6.4.bb | 2 | ||||
| -rw-r--r-- | packages/wxwidgets/wxbase_2.8.9.bb | 2 | ||||
| -rw-r--r-- | packages/wxwidgets/wxwidgets_2.6.4.bb | 2 | ||||
| -rw-r--r-- | packages/wxwidgets/wxwidgets_2.8.9.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/wxwidgets/wxbase_2.6.4.bb b/packages/wxwidgets/wxbase_2.6.4.bb index 347c2bd192..c8350d8aa5 100644 --- a/packages/wxwidgets/wxbase_2.6.4.bb +++ b/packages/wxwidgets/wxbase_2.6.4.bb @@ -1,6 +1,6 @@ require wxbase.inc -FILE_PR = "r0" +PR = "r0" EXTRA_OECONF = "--enable-largefile" diff --git a/packages/wxwidgets/wxbase_2.8.9.bb b/packages/wxwidgets/wxbase_2.8.9.bb index d1b13055fc..bb46a52a88 100644 --- a/packages/wxwidgets/wxbase_2.8.9.bb +++ b/packages/wxwidgets/wxbase_2.8.9.bb @@ -2,7 +2,7 @@ require wxbase.inc DEFAULT_PREFERENCE = "-1" -FILE_PR = "r0" +PR = "r0" SRC_URI += "file://Makefile.in.patch;patch=1" diff --git a/packages/wxwidgets/wxwidgets_2.6.4.bb b/packages/wxwidgets/wxwidgets_2.6.4.bb index cd2aea3345..775cf90587 100644 --- a/packages/wxwidgets/wxwidgets_2.6.4.bb +++ b/packages/wxwidgets/wxwidgets_2.6.4.bb @@ -1,6 +1,6 @@ require wxwidgets.inc -FILE_PR = "r0" +PR = "r0" LEAD_SONAME = "libwx_gtk2_core-2.6.so" diff --git a/packages/wxwidgets/wxwidgets_2.8.9.bb b/packages/wxwidgets/wxwidgets_2.8.9.bb index e27761ee0c..8e8d3565fd 100644 --- a/packages/wxwidgets/wxwidgets_2.8.9.bb +++ b/packages/wxwidgets/wxwidgets_2.8.9.bb @@ -1,6 +1,6 @@ require wxwidgets.inc -FILE_PR = "r0" +PR = "r0" LEAD_SONAME = "libwx_gtk2_core-2.8.so" |