From: Chris Larson <clarson@kergoth.com>
Date: Wed, 20 Oct 2004 21:55:56 +0000 (+0000)
Subject: Merge
X-Git-Tag: Release-2010-05/1~16514
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=802737ee512015fe27560122fdd5d63e0242369c;p=openembedded.git

Merge

2004/10/20 17:54:11-04:00 joshuawise.com!joshua
Enable xlocale for diet-x11, as some things tend to break without it.

BKrev: 4176deecIWbN0Awb_lh0TcLra95O8w
---

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index d1d7890311..08ad72f953 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -26,6 +26,7 @@ jacques@home.(none)
 jcrouse@forsteri.amd.com
 jgrant@desknote.thegrantclan.org
 joshin@styx.techsurgeons.com
+joshua@bluefire.joshuawise.com
 kebert@geralt.doma
 kergoth@beast.local
 kergoth@direwolf.(none)
diff --git a/x11/diet-x11_6.2.1.oe b/x11/diet-x11_6.2.1.oe
index 66f449ecb9..01fed4d651 100644
--- a/x11/diet-x11_6.2.1.oe
+++ b/x11/diet-x11_6.2.1.oe
@@ -1,4 +1,4 @@
 SECTION = "x11/base"
 include x11_${PV}.oe
 
-EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+EXTRA_OECONF = "--disable-xcms --enable-xlocale --disable-xkb"