summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-03-22 15:09:07 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-22 15:09:07 +0000
commit70141cbcc84f0911edaa7d91de6ba2daa64319cc (patch)
treea9d1f52c70aabb503ebbfa3d3b008018aec0403f /meta
parent04263dc426f2444d822915257b28393eb8ff6198 (diff)
downloadpoky-70141cbcc84f0911edaa7d91de6ba2daa64319cc.tar.gz
bitbake/providers: Fix merge error
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
0 files changed, 0 insertions, 0 deletions