diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/poky.conf | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/qemu.conf | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index d96a8d7800..ee3ec0680f 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -145,7 +145,6 @@ PREFERRED_VERSION_evince ?= "0.3.2" | |||
145 | PREFERRED_VERSION_firefox ?= "1.0" | 145 | PREFERRED_VERSION_firefox ?= "1.0" |
146 | PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" | 146 | PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" |
147 | PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" | 147 | PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" |
148 | PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" | ||
149 | PREFERRED_VERSION_keylaunch ?= "2.0.7" | 148 | PREFERRED_VERSION_keylaunch ?= "2.0.7" |
150 | PREFERRED_VERSION_librsvg ?= "2.6.5" | 149 | PREFERRED_VERSION_librsvg ?= "2.6.5" |
151 | PREFERRED_VERSION_libgsm ?= "1.0.10" | 150 | PREFERRED_VERSION_libgsm ?= "1.0.10" |
diff --git a/meta/conf/machine/include/qemu.conf b/meta/conf/machine/include/qemu.conf index 83ddf24b87..c896c38f57 100644 --- a/meta/conf/machine/include/qemu.conf +++ b/meta/conf/machine/include/qemu.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | PCMCIA_MANAGER = "pcmciautils" | 1 | PCMCIA_MANAGER = "pcmciautils" |
2 | PREFERRED_PROVIDER_xserver = "xserver-kdrive" | 2 | PREFERRED_PROVIDER_xserver = "xserver-kdrive" |
3 | GUI_MACHINE_CLASS = "bigscreen" | 3 | GUI_MACHINE_CLASS = "bigscreen" |
4 | GPE_EXTRA_INSTALL += "gaim sylpheed" | ||
5 | 4 | ||
6 | MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" | 5 | MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" |
7 | 6 | ||