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:02:45 +0100 |
| commit | 5a4342cb2ecfc8a2f4a3868a5ba66c79fbe07d5e (patch) | |
| tree | 4e7ffecf8c5fd29390621fedde619b7734d2b08d /scripts/poky-git-proxy-socks.c | |
| parent | 6e4579b32be125cab74d4ad2014fda201d6531c1 (diff) | |
| download | poky-5a4342cb2ecfc8a2f4a3868a5ba66c79fbe07d5e.tar.gz | |
qemu: fix sloppy merge
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'scripts/poky-git-proxy-socks.c')
0 files changed, 0 insertions, 0 deletions