Merge branch 'opendreambox-1.6' into vuplus-1.6
authorikseong <ikseong@vuplus>
Fri, 9 Jul 2010 01:39:22 +0000 (10:39 +0900)
committerikseong <ikseong@vuplus>
Fri, 9 Jul 2010 01:41:39 +0000 (10:41 +0900)
commit41fd7d68b3f115c6e2fb44166979e9d8add9c795
tree99e2bdeba0406b315ac7b1240a2ef104cc81287d
parent97bfcde65d0f4c04742c5f6d96bad2dfcd9f0264
parenta8efbd47ca0e5eda36b8608a8b4ebbec572edd42
Merge branch 'opendreambox-1.6' into vuplus-1.6

Conflicts:

recipes/enigma2/enigma2.bb
recipes/gstreamer/gst-plugins-base_0.10.29.bb

Contents:
enigma2 depends
gst-plugins-base revision
gst-plugins-good src_uri,patch,revision
libsoup
recipes/enigma2/enigma2.bb
recipes/gnome/libsoup-2.4_2.29.5.bb
recipes/gstreamer/gst-plugins-base_0.10.29.bb