projects / vuplus_openembedded / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b809f9b c2cbdb1)
Merge branch 'opendreambox' of git://git.ritzmo.de/openembedded into opendreambox
authorFelix Domke <tmbinc@elitedvb.net>
Mon, 5 Jan 2009 00:03:33 +0000 (01:03 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Mon, 5 Jan 2009 00:03:33 +0000 (01:03 +0100)
Conflicts:

packages/dvd+rw-tools/dvd+rw-tools_7.0.bb
packages/libdreamdvd/libdreamdvd.bb
packages/mjpegtools/mjpegtools_1.9.0rc3.bb

1  2 
packages/libcdio/libcdio_0.80.bb patch | diff1 | diff2 | blob | history

diff --cc packages/libcdio/libcdio_0.80.bb
Simple merge
openembedded 1.6 repository.