Merge branch 'shared/file-pr-revert' into org.openembedded.dev
authorHolger Hans Peter Freyther <zecke@selfish.org>
Wed, 22 Oct 2008 20:33:26 +0000 (22:33 +0200)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Wed, 22 Oct 2008 20:38:30 +0000 (22:38 +0200)
commit53bfb2398c16d2065ffa2bc6cd34c83e15347014
tree3793fb7c6cb4799ec2c029b433636cb60fe7625b
parent576cfbfba8880ea4421369d35236c696188b144d
parent245f7d129f3dba351b3c8ef284df69a86261904c
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
38 files changed:
classes/package.bbclass
conf/bitbake.conf
packages/busybox/busybox_1.11.3.bb
packages/ccid/ccid_1.3.8.bb
packages/dmidecode/dmidecode_2.9.bb
packages/dsplink/dsplink_1.51.00.08.bb
packages/gdb/gdb_6.3.bb
packages/gdb/gdb_6.4.bb
packages/gdb/gdb_6.6.bb
packages/gdb/gdb_6.7.1.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-image_1.2.6.bb
packages/libsdl/libsdl-x11_1.2.11.bb
packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
packages/linux/linux-rp_2.6.26.bb
packages/meta/slugos-packages.bb
packages/mozilla/fennec_hg.bb
packages/nfs-utils/nfs-utils_1.1.2.bb
packages/pcsc-lite/pcsc-lite_1.4.102.bb
packages/perl/perl-native_5.8.8.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