diff options
author | Graeme Gregory <dp@xora.org.uk> | 2008-03-20 06:25:41 +0000 |
---|---|---|
committer | Graeme Gregory <dp@xora.org.uk> | 2008-03-20 06:25:41 +0000 |
commit | 5a01774a7dabfb14bfeab0d900113c206afef853 (patch) | |
tree | c828cb015607d5ba04eeacf770f6c0a215f21226 | |
parent | 59bf0fe4238ee5c18cf7dd7a8598b64445b8457f (diff) |
merge
-rw-r--r-- | packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb (renamed from packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb index d8a51ea824..d8a51ea824 100644 --- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge +++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb |