Merge branch 'opendreambox' of git://git.ritzmo.de/openembedded into opendreambox
authorFelix Domke <tmbinc@elitedvb.net>
Mon, 9 Feb 2009 14:27:44 +0000 (15:27 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Mon, 9 Feb 2009 14:27:44 +0000 (15:27 +0100)
commit0e4c7da21d2824d6380e1aaf49f5fb865a0928ed
tree502e22b9019fe87d630acdbfb798bbca71f32d51
parent6255310d42533146bafb05e6a2be9fa6ec80b90e
parentec918fa5831f5c12b67fd2e54ecdfea670c758d0
Merge branch 'opendreambox' of git://git.ritzmo.de/openembedded into opendreambox

Conflicts:

conf/checksums.ini
packages/enigma2/enigma2.bb
packages/tuxbox/tuxbox-tuxtxt-32bpp.bb
classes/package.bbclass
conf/checksums.ini
conf/distro/opendreambox.conf
packages/busybox/busybox_1.11.3.bb
packages/enigma2/enigma2.bb
packages/gstreamer/gst-plugins.inc
packages/initscripts/initscripts-opendreambox_1.0.bb
packages/python/python_2.6.1.bb
packages/tuxbox/tuxbox-tuxtxt-32bpp.bb