diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-07 13:54:50 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-07 13:54:50 +0000 |
commit | 0e26f53f9e2f190b302235864552956ed8f6d39b (patch) | |
tree | 9e6e75ad30f88cd288ef0b31f1a2dae0a4626e43 /meta/recipes-qt/qt4/qt-4.6.3.inc | |
parent | 847b717862a518746bc5e457f40760e3bd36f1db (diff) | |
download | openembedded-core-0e26f53f9e2f190b302235864552956ed8f6d39b.tar.gz openembedded-core-0e26f53f9e2f190b302235864552956ed8f6d39b.tar.bz2 openembedded-core-0e26f53f9e2f190b302235864552956ed8f6d39b.tar.xz openembedded-core-0e26f53f9e2f190b302235864552956ed8f6d39b.zip |
bitbake/cooker.py: Fix merge conflict with upstream which was preventing clean bitbake shutdown
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.6.3.inc')
0 files changed, 0 insertions, 0 deletions