code.vuplus.com Git - vuplus_openembedded/commit

author	Felix Domke <tmbinc@elitedvb.net>
	Thu, 4 Jun 2009 12:11:58 +0000 (14:11 +0200)
committer	Felix Domke <tmbinc@elitedvb.net>
	Thu, 4 Jun 2009 12:11:58 +0000 (14:11 +0200)
commit	d93ab8cf1574c21e952b2c4195b2364c1656d177
tree	8558a5ecf11ceb141dbc89cd8917f05979650fec	tree \| snapshot
parent	6c04559a9c6b814a546607bc73bcc7b6f60e7738	commit \| diff
parent	c6d0985249335abe2dfc74b839649c3012ff0b65	commit \| diff

Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into opendreambox

Conflicts:

conf/checksums.ini
recipes/alsa/alsa-lib_1.0.18.bb
recipes/avahi/avahi.inc
recipes/avahi/avahi_0.6.24.bb
recipes/gstreamer/gst-plugins-bad_0.10.11.bb
recipes/gstreamer/gst-plugins-base_0.10.22.bb
recipes/gstreamer/gst-plugins-good_0.10.14.bb
recipes/gstreamer/gst-plugins-ugly_0.10.11.bb
recipes/liboil/liboil_0.3.15.bb
recipes/madwifi/madwifi-ng_r.inc

22 files changed:

classes/package.bbclass	diff1 \|	diff2 \|	blob \| history
conf/checksums.ini	diff1 \|	diff2 \|	blob \| history
recipes/alsa/alsa-lib_1.0.18.bb	diff1 \|	diff2 \|	blob \| history
recipes/avahi/avahi.inc	diff1 \|	diff2 \|	blob \| history
recipes/avahi/avahi_0.6.24.bb	diff1 \|	diff2 \|	blob \| history
recipes/base-files/base-files_3.0.14.bb	diff1 \|	diff2 \|	blob \| history
recipes/busybox/busybox_1.13.2.bb	diff1 \|	diff2 \|	blob \| history
recipes/dbus/dbus.inc	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-bad_0.10.6.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-base_0.10.17.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-base_0.10.22.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-good_0.10.13.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-good_0.10.14.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-ugly_0.10.10.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins.inc	diff1 \|	diff2 \|	blob \| history
recipes/liboil/liboil_0.3.15.bb	diff1 \|	diff2 \|	blob \| history
recipes/madwifi/madwifi-ng_r.inc	diff1 \|	diff2 \|	blob \| history
recipes/madwifi/madwifi-ng_r3837-20080802.bb	diff1 \|	diff2 \|	blob \| history
recipes/ppp/ppp_2.4.3.bb	diff1 \|	diff2 \|	blob \| history
recipes/python/python_2.6.1.bb	diff1 \|	diff2 \|	blob \| history
recipes/samba/samba.inc	diff1 \|	diff2 \|	blob \| history

openembedded 1.6 repository.

RSS Atom

classes/package.bbclass	diff1 \|	diff2 \|	blob \| history
conf/checksums.ini	diff1 \|	diff2 \|	blob \| history
recipes/alsa/alsa-lib_1.0.18.bb	diff1 \|	diff2 \|	blob \| history
recipes/avahi/avahi.inc	diff1 \|	diff2 \|	blob \| history
recipes/avahi/avahi_0.6.24.bb	diff1 \|	diff2 \|	blob \| history
recipes/base-files/base-files_3.0.14.bb	diff1 \|	diff2 \|	blob \| history
recipes/busybox/busybox_1.13.2.bb	diff1 \|	diff2 \|	blob \| history
recipes/dbus/dbus.inc	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-bad_0.10.6.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-base_0.10.17.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-base_0.10.22.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-good_0.10.13.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-good_0.10.14.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins-ugly_0.10.10.bb	diff1 \|	diff2 \|	blob \| history
recipes/gstreamer/gst-plugins.inc	diff1 \|	diff2 \|	blob \| history
recipes/liboil/liboil_0.3.15.bb	diff1 \|	diff2 \|	blob \| history
recipes/madwifi/madwifi-ng_r.inc	diff1 \|	diff2 \|	blob \| history
recipes/madwifi/madwifi-ng_r3837-20080802.bb	diff1 \|	diff2 \|	blob \| history
recipes/ppp/ppp_2.4.3.bb	diff1 \|	diff2 \|	blob \| history
recipes/python/python_2.6.1.bb	diff1 \|	diff2 \|	blob \| history
recipes/samba/samba.inc	diff1 \|	diff2 \|	blob \| history