diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-03 21:57:01 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-03 21:57:01 +0000 |
commit | 91f725a1cd51b6dd08b6cd4deb0d71ea19bc16d4 (patch) | |
tree | 903478bd1224b6036e8749e93da401ef2a9cd84a /packages/apmd/apmd_3.2.2.bb | |
parent | cf6a9b059d567d022435b0077fc1ba73e4955fe4 (diff) | |
parent | 14e90875fff476f1c8487d781e44c8d9f83179d5 (diff) |
explicit_merge of 'ff8f93bf075f5225452de6de0f7feb3aa1174889'
and 'c47b56a3ef9d7d425411c60ff6fef2a174b20ea6'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/apmd/apmd_3.2.2.bb')
0 files changed, 0 insertions, 0 deletions