diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-03 23:37:06 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-03 23:37:06 +0000 |
| commit | 07e1fc5185995fe409ecc8bf0f1ec1d30ae71bcc (patch) | |
| tree | 903478bd1224b6036e8749e93da401ef2a9cd84a /packages/shared-mime-info | |
| parent | d6e807b8fe873f37bf4b77d2c7fcfbf3ad2cd1d7 (diff) | |
| parent | 91f725a1cd51b6dd08b6cd4deb0d71ea19bc16d4 (diff) | |
explicit_merge of 'd8cdf62120af403fb6e212a637f07ee6bec94b05'
and '11923cb95e906cb69ddced31b2fe3e5a10ab53b0'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/shared-mime-info')
0 files changed, 0 insertions, 0 deletions