projects / vuplus_openembedded / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 12986b0 cece013)
Merge commit 'cece0135ff975cd841ef63a8cf4bf17ff7b15860' into opendreambox
authorFelix Domke <tmbinc@elitedvb.net>
Fri, 24 Apr 2009 14:01:50 +0000 (16:01 +0200)
committerFelix Domke <tmbinc@elitedvb.net>
Fri, 24 Apr 2009 14:01:50 +0000 (16:01 +0200)
commit5376a4892078c6e3db0301b8ae02653ba1e364bd
tree1e6c8826be0539dbb39e74b7cd83d55e240772datree | snapshot
parent12986b0a47f5e813d5e811807ca930bd1da75e62commit | diff
parentcece0135ff975cd841ef63a8cf4bf17ff7b15860commit | diff
Merge commit 'cece0135ff975cd841ef63a8cf4bf17ff7b15860' into opendreambox

Conflicts:

conf/checksums.ini
packages/avahi/avahi_0.6.24.bb
packages/base-files/base-files_3.0.14.bb
packages/dsplink/dsplink.inc
packages/libsidplay/libsidplay_1.36.59.bb
packages/mc/mc.inc
packages/samba/samba_3.0.23c.bb
16 files changed:
classes/package.bbclass diff1 | diff2 | blob | history
classes/rootfs_ipk.bbclass diff1 | diff2 | blob | history
conf/checksums.ini diff1 | diff2 | blob | history
packages/avahi/avahi_0.6.24.bb diff1 | diff2 | blob | history
packages/base-files/base-files_3.0.14.bb diff1 | diff2 | blob | history
packages/busybox/busybox_1.11.3.bb diff1 | diff2 | blob | history
packages/dbus/dbus.inc diff1 | diff2 | blob | history
packages/gstreamer/gst-plugins-bad_0.10.6.bb diff1 | diff2 | blob | history
packages/gstreamer/gst-plugins-good_0.10.13.bb | diff2 | blob | history
packages/gstreamer/gst-plugins-ugly_0.10.10.bb diff1 | diff2 | blob | history
packages/gstreamer/gst-plugins.inc diff1 | diff2 | blob | history
packages/mc/mc.inc diff1 | diff2 | blob | history
packages/opkg/opkg.inc diff1 | diff2 | blob | history
packages/python/python_2.6.1.bb diff1 | diff2 | blob | history
packages/samba/samba.inc diff1 | diff2 | blob | history
packages/samba/samba_3.0.23c.bb diff1 | diff2 | blob | history
openembedded 1.6 repository.