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

[tmbinc commit]

fix remaining conflicts

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 717b91542897124c8b4223fbacd82af0aaecf154
ViewMTN: http://monotone.openembedded.org/revision.psp?id=717b91542897124c8b4223fbacd82af0aaecf154
Files:
1
packages/gcc/gcc_4.1.0.bb
packages/python/python-2.4.3
packages/python/python-2.4.3/autohell.patch
packages/python/python-2.4.3/bindir-libdir.patch
packages/python/python-2.4.3/crosscompile.patch
packages/python/python-2.4.3/fix-tkinter-detection.patch
packages/python/python-2.4.3/sitebranding.patch
packages/strace/strace-4.5.14
Diffs:

#
# mt diff -r0a0b4dd6b7daa2c82b633f52a9b2cd2425990630 -r717b91542897124c8b4223fbacd82af0aaecf154
#
# 
# 
# delete "packages/gcc/gcc_4.1.0.bb"
# 
# delete "packages/python/python-2.4.3"
# 
# delete "packages/python/python-2.4.3/autohell.patch"
# 
# delete "packages/python/python-2.4.3/bindir-libdir.patch"
# 
# delete "packages/python/python-2.4.3/crosscompile.patch"
# 
# delete "packages/python/python-2.4.3/fix-tkinter-detection.patch"
# 
# delete "packages/python/python-2.4.3/sitebranding.patch"
# 
# delete "packages/strace/strace-4.5.14"
#