diff options
| author |   Klaus Kurzmann <mok@fluxnetz.de> | 2009-12-15 14:46:02 +0100 |
|---|---|---|
| committer | Klaus Kurzmann <mok@fluxnetz.de> | 2009-12-15 14:46:02 +0100 |
| commit | 54fa869952dc6b7c2f05018f65434877257d44de (patch) | |
| tree | 061bbe8844bd42f826a53ce1b4414dc6a568d86c /recipes/openmoko-projects/om-locations_git.bb | |
| parent | b9f0d895f3d94ff42a8cd5c02924443915ce0181 (diff) | |
| parent | 47d6cb217ff161738488f4f82af9dd8f8c616ce0 (diff) | |
| download | openembedded-54fa869952dc6b7c2f05018f65434877257d44de.tar.gz | |
Merge branch 'org.openembedded.dev' into martin_jansa/srcpv
Conflicts:
recipes/mesa/mesa-xlib_7.2.bb
recipes/uclibc/uclibc_nptl.bb
re-add SRCPV to illume-keyboards-shr
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
Diffstat (limited to 'recipes/openmoko-projects/om-locations_git.bb')
0 files changed, 0 insertions, 0 deletions