diff options
author | Klaus Kurzmann <mok@fluxnetz.de> | 2009-12-13 23:02:36 +0100 |
---|---|---|
committer | Klaus Kurzmann <mok@fluxnetz.de> | 2009-12-13 23:02:36 +0100 |
commit | b9f0d895f3d94ff42a8cd5c02924443915ce0181 (patch) | |
tree | 1282d6bf5fc36dd2dac527ba1289feac8bf5de87 /recipes/kexecboot/kexecboot_git.bb | |
parent | 1ab9cec95656c0616193989adfbc6001339efb20 (diff) | |
parent | 19ab14a2f98087a549f02c21b6770b8080d6502b (diff) | |
download | openembedded-b9f0d895f3d94ff42a8cd5c02924443915ce0181.tar.gz |
Merge branch 'org.openembedded.dev' into martin_jansa/srcpv
Conflicts:
recipes/shr/phoneuid_git.bb
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
Diffstat (limited to 'recipes/kexecboot/kexecboot_git.bb')
0 files changed, 0 insertions, 0 deletions