diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-06-23 18:01:23 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-06-23 18:01:23 +0100 |
| commit | c9e77c18aa0c7962e00559d4122d840f90a62e79 (patch) | |
| tree | 480720d4c1f422544f5f8c514ecf4508a6df185e /meta/packages/settings-daemon/files | |
| parent | 8ce85086f697eb0b08076ee8939d3167cab4c549 (diff) | |
| download | openembedded-core-c9e77c18aa0c7962e00559d4122d840f90a62e79.tar.gz openembedded-core-c9e77c18aa0c7962e00559d4122d840f90a62e79.tar.bz2 openembedded-core-c9e77c18aa0c7962e00559d4122d840f90a62e79.tar.xz openembedded-core-c9e77c18aa0c7962e00559d4122d840f90a62e79.zip | |
qemu: fix sloppy merge
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/packages/settings-daemon/files')
0 files changed, 0 insertions, 0 deletions