diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-03 21:53:17 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-03 21:53:17 +0000 |
commit | 64874973f87d493c6376c60d461c5dc4d8f68400 (patch) | |
tree | 85ea8bc5962843a0b7418028affd21d66db8a292 /packages/evince/.mtn2git_empty | |
parent | 7d542955fe0d78730e280e586a03daffd3c1d527 (diff) | |
parent | de44fa141e4d115141e0fff00e4304d9bb9faf9e (diff) |
explicit_merge of '662a617882f791ea9f9ca8aa0bd50f264d6c1db7'
and '00f00d3a48aefe68a725e5e07c63fd5910f1b995'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/evince/.mtn2git_empty')
0 files changed, 0 insertions, 0 deletions