[oe-commits] Holger Hans Peter Freyther : Merge branch 'shared/file-pr-revert' into org. openembedded.dev
GIT User account
git at amethyst.openembedded.net
Thu Oct 23 17:33:05 UTC 2008
Module: openembedded.git
Branch: stefan/xo-support
Commit: 53bfb2398c16d2065ffa2bc6cd34c83e15347014
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=53bfb2398c16d2065ffa2bc6cd34c83e15347014
Author: Holger Hans Peter Freyther <zecke at selfish.org>
Date: Wed Oct 22 22:33:26 2008 +0200
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
---
More information about the Openembedded-commits
mailing list