[oe-commits] org.oe.dreambox fix conflicts

[tmbinc commit]

fix conflicts

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 0a0b4dd6b7daa2c82b633f52a9b2cd2425990630
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0a0b4dd6b7daa2c82b633f52a9b2cd2425990630
Files:
1
packages/dvbtools/dvbtraffic.bb
packages/dvbtools/sctzap_cvs.bb
packages/gcc/gcc-4.1.0
packages/gcc/gcc-4.1.0/arm-nolibfloat.patch
packages/gcc/gcc-4.1.0/arm-softfloat.patch
packages/gcc/gcc-4.1.0/ldflags.patch
packages/gcc/gcc-4.1.0/zecke-no-host-includes.patch
packages/gcc/gcc-cross-initial_4.1.0.bb
packages/gcc/gcc-cross-sdk_4.1.0.bb
packages/gcc/gcc-cross_4.1.0.bb
packages/gstreamer/gst-plugins-bad_0.10.1.bb
packages/gstreamer/gst-plugins-base_0.10.5.bb
packages/gstreamer/gst-plugins-good_0.10.2.bb
packages/gstreamer/gst-plugins-ugly_0.10.2.bb
packages/gstreamer/gst-plugins.inc
packages/gstreamer/gstreamer_0.10.4.bb
packages/python/python-2.4.3-manifest.inc
packages/python/python_2.4.3.bb
packages/strace/strace-4.5.14/arm-eabi.patch
packages/strace/strace-4.5.14/sh-arch-update.patch
packages/strace/strace-4.5.14/sh-syscall-update.patch
packages/strace/strace_4.5.14.bb
Diffs:

#
# mt diff -rf1ae9d5e5629b09643d5895312ada9a356e6b700 -r0a0b4dd6b7daa2c82b633f52a9b2cd2425990630
#
# 
# 
# delete "packages/dvbtools/dvbtraffic.bb"
# 
# delete "packages/dvbtools/sctzap_cvs.bb"
# 
# delete "packages/gcc/gcc-4.1.0"
# 
# delete "packages/gcc/gcc-4.1.0/arm-nolibfloat.patch"
# 
# delete "packages/gcc/gcc-4.1.0/arm-softfloat.patch"
# 
# delete "packages/gcc/gcc-4.1.0/ldflags.patch"
# 
# delete "packages/gcc/gcc-4.1.0/zecke-no-host-includes.patch"
# 
# delete "packages/gcc/gcc-cross-initial_4.1.0.bb"
# 
# delete "packages/gcc/gcc-cross-sdk_4.1.0.bb"
# 
# delete "packages/gcc/gcc-cross_4.1.0.bb"
# 
# delete "packages/gstreamer/gst-plugins-bad_0.10.1.bb"
# 
# delete "packages/gstreamer/gst-plugins-base_0.10.5.bb"
# 
# delete "packages/gstreamer/gst-plugins-good_0.10.2.bb"
# 
# delete "packages/gstreamer/gst-plugins-ugly_0.10.2.bb"
# 
# delete "packages/gstreamer/gst-plugins.inc"
# 
# delete "packages/gstreamer/gstreamer_0.10.4.bb"
# 
# delete "packages/python/python-2.4.3-manifest.inc"
# 
# delete "packages/python/python_2.4.3.bb"
# 
# delete "packages/strace/strace-4.5.14/arm-eabi.patch"
# 
# delete "packages/strace/strace-4.5.14/sh-arch-update.patch"
# 
# delete "packages/strace/strace-4.5.14/sh-syscall-update.patch"
# 
# delete "packages/strace/strace_4.5.14.bb"
#