]> code.ossystems Code Review - openembedded-core.git/commit
qemu: fix sloppy merge
authorJoshua Lock <josh@linux.intel.com>
Wed, 23 Jun 2010 17:01:23 +0000 (18:01 +0100)
committerJoshua Lock <josh@linux.intel.com>
Wed, 23 Jun 2010 17:01:23 +0000 (18:01 +0100)
commitc9e77c18aa0c7962e00559d4122d840f90a62e79
tree480720d4c1f422544f5f8c514ecf4508a6df185e
parent8ce85086f697eb0b08076ee8939d3167cab4c549
qemu: fix sloppy merge

Signed-off-by: Joshua Lock <josh@linux.intel.com>
meta/packages/qemu/qemu_0.12.4.bb