summaryrefslogtreecommitdiff
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-03 23:45:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-03 23:45:25 +0000
commita72822d315d7bc35a424b0807693ad7a3317c519 (patch)
tree9f44d4a04595e6523be087f9948876748e84181f /meta/conf
parentbcdd048e4857b5f8a343c434ade5a02ab1db33bc (diff)
downloadopenembedded-core-a72822d315d7bc35a424b0807693ad7a3317c519.tar.gz
openembedded-core-a72822d315d7bc35a424b0807693ad7a3317c519.tar.bz2
openembedded-core-a72822d315d7bc35a424b0807693ad7a3317c519.zip
Fixup merge error and apply cleanups
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
0 files changed, 0 insertions, 0 deletions