diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-12-06 16:10:21 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-12-06 16:10:21 +0000 |
| commit | 2031ed0948c018ac1d1c0e33eb1e76d2fccb8b38 (patch) | |
| tree | a49f573eda5605d67c989da3d8ed29192caafa42 /conf/distro | |
| parent | aa467290637b8d7ac2401d2b89f13ac5c04eef2f (diff) | |
| parent | 4cff548ae08c8724bf27ea62c134c8df99cbde14 (diff) | |
merge of bb8a3b34208ff63b05eb2b6f77183737b9a38c6a
and efe5ba84574e7ae7e86f7fb34cf883a21c2144bb
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/familiar-0.8.3.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf index 5d19ca02be..53614d9291 100644 --- a/conf/distro/familiar-0.8.3.conf +++ b/conf/distro/familiar-0.8.3.conf @@ -4,7 +4,7 @@ DISTRO_VERSION = "v0.8.3-unofficial-unsupported-snapshot-${DATE}" include conf/distro/familiar.conf -#"${@bb.fatal('This file is unmaintained in the org.oe.dev branch, use the org.openembedded.oz354fam083 branch instead. You can also remove this line, but don't complain if something breaks')}" +"${@bb.fatal('This file is unmaintained in the org.oe.dev branch, use the org.openembedded.oz354fam083 branch instead. You can also remove this line, but don't complain if something breaks')}" @@ -52,7 +52,7 @@ PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" PREFERRED_PROVIDER_x11 = "diet-x11" -#include conf/distro/preferred-gpe-versions-2.7.inc +include conf/distro/preferred-gpe-versions-2.7.inc # # E |