diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 01:09:51 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 01:09:51 +0100 |
commit | ce81a5820f712888529f7814ae11cce4ce3f6bd9 (patch) | |
tree | c6aa834d51accf4f4182bc0c7bfd93247c12607f /packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch | |
parent | 61d929464d8d345d5e0a4d6b1a9955c77f708e3c (diff) | |
parent | e13eb6ed3ee15de931a517361ad80f9248798873 (diff) |
Merge branch 'holger/openmoko-merges' into org.openembedded.dev
Conflicts:
packages/tasks/task-openmoko-feed.bb
Diffstat (limited to 'packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch')
-rw-r--r-- | packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch index 227a97e71a..fa8db6f69d 100644 --- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch @@ -17,7 +17,7 @@ Index: u-boot/common/cmd_license.c +++ u-boot/common/cmd_license.c @@ -0,0 +1,57 @@ +/* -+ * (C) Copyright 2007 by OpenMoko, Inc. ++ * (C) Copyright 2007 by Openmoko, Inc. + * Author: Harald Welte <laforge@openmoko.org> + * + * See file CREDITS for list of people who contributed to this |