diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-02-05 06:36:28 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-05 06:36:28 +0000 |
| commit | dc20efdac5955750b579ad16e2515f63ab8d0f8e (patch) | |
| tree | be91eada316b9abe6b1a95bb5ac938ed4f8c0e2c /conf | |
| parent | 19f3fb04fe976bf96329356ea2209e92e8827a21 (diff) | |
| parent | 58d8ffa2cfd134d912985cb9fe41727b74461ab0 (diff) | |
explicit_merge of '911d39563f4bbb32b27acb504168de96ff1e68f7'
and 'd17c8965045bca1d838e85c0b4579217b647682c'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'conf')
0 files changed, 0 insertions, 0 deletions