diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:19:08 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:19:08 +0000 |
| commit | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (patch) | |
| tree | 6f5c507ceb9741a5598d2531b980c2f6d7ddf7f0 /packages/ipkg/ipkg-collateral/simpad | |
| parent | edbb148535f63e58a8e10ed5c68b7aecb983602e (diff) | |
| parent | ce0af9851e5a2231b9ed9fcfecfd10cc4b7794c3 (diff) | |
explicit_merge of '85da89c673cc2faec29d5ea692e6e7638f4c1b5e'
and '5f32961e5d0f4132f4513cbeac7fe59dc5ae5315'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/ipkg/ipkg-collateral/simpad')
0 files changed, 0 insertions, 0 deletions