diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2009-06-26 22:32:52 +0400 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2009-06-26 22:32:52 +0400 |
| commit | c91a54aef8a39e7cbb2571574f56f2cf12104ff1 (patch) | |
| tree | e68102d093c111affd9208b78df9c18aa837c3b8 | |
| parent | 323edc5ef4c3d8572ee0b4fd185ca6e3166d6b45 (diff) | |
| parent | 84efca2e2ad21d3d7cea68c0327f91aaf773eb67 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Conflicts:
recipes/musicpd/mpd_0.14.2.bb
