summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-06-06 13:09:54 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-06-06 13:09:54 +0000
commit1c4b9cfb6f0a3967ca16513150658a488efa3e85 (patch)
treeb1b6cf57ac35dd1d836f7a8bf0e1b4a90c657260 /conf
parent923c2692e9bfc580eee2a564d5ef8824080f71fa (diff)
parent1d30c7c58cff86b1886f52f0b75565206fa2d72e (diff)
merge of '3c3876e3f4fa037f2c9bfce18e3192822f1557cf'
and 'e8b3409511829c8c35d2859b5756d0206fbb3016'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/chinook-compat.conf2
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc6
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index e834c8c4c8..1503a6f380 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -169,7 +169,7 @@ PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_VERSION_classpath = "0.97.1"
+PREFERRED_VERSION_classpath = "0.97.2"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 1fc30312f5..0c6b63ec04 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -162,9 +162,9 @@ PREFERRED_VERSION_chrpath-native ?= "0.13"
PREFERRED_VERSION_ckermit ?= "211"
PREFERRED_VERSION_clamav ?= "0.91.1"
PREFERRED_VERSION_clamsmtp ?= "1.8"
-PREFERRED_VERSION_classpath ?= "0.97.1"
-PREFERRED_VERSION_classpath-gtk ?= "0.97.1"
-PREFERRED_VERSION_classpath-minimal ?= "0.97.1"
+PREFERRED_VERSION_classpath ?= "0.97.2"
+PREFERRED_VERSION_classpath-gtk ?= "0.97.2"
+PREFERRED_VERSION_classpath-minimal ?= "0.97.2"
PREFERRED_VERSION_classpath-native ?= "0.96.1"
PREFERRED_VERSION_clearsilver ?= "0.10.3"
PREFERRED_VERSION_clish ?= "0.7.1"