[oe-commits] Koen Kooi : font-util: fix merge damage

git version control git at git.openembedded.org
Fri Dec 4 10:28:11 UTC 2009


Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 99f78d400254c8f8a6d6a998ac72a9c49a648dd3
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=99f78d400254c8f8a6d6a998ac72a9c49a648dd3

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri Dec  4 11:14:49 2009 +0100

font-util: fix merge damage

---

 recipes/xorg-font/font-util-native_1.0.1.bb |    2 +-
 recipes/xorg-font/font-util_1.0.1.bb        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/xorg-font/font-util-native_1.0.1.bb b/recipes/xorg-font/font-util-native_1.0.1.bb
index cb117bf..ffcd60c 100644
--- a/recipes/xorg-font/font-util-native_1.0.1.bb
+++ b/recipes/xorg-font/font-util-native_1.0.1.bb
@@ -1,4 +1,4 @@
-be inherit native
+inherit native
 require xorg-font-common.inc
 
 XORG_PN = "font-util"
diff --git a/recipes/xorg-font/font-util_1.0.1.bb b/recipes/xorg-font/font-util_1.0.1.bb
index 5a1761b..4d55407 100644
--- a/recipes/xorg-font/font-util_1.0.1.bb
+++ b/recipes/xorg-font/font-util_1.0.1.bb
@@ -1,4 +1,4 @@
-Qurequire xorg-font-common.inc
+require xorg-font-common.inc
 
 PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
 





More information about the Openembedded-commits mailing list