From 5a01774a7dabfb14bfeab0d900113c206afef853 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 06:25:41 +0000 Subject: [PATCH] merge --- ...ko_1.3.1+git+svn.bb.merge => u-boot-openmoko_1.3.1+git+svn.bb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/u-boot/{u-boot-openmoko_1.3.1+git+svn.bb.merge => u-boot-openmoko_1.3.1+git+svn.bb} (100%) 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 similarity index 100% rename from packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge rename to packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb -- 2.39.5