summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKlaus Kurzmann <mok@fluxnetz.de>2009-11-30 11:42:46 +0100
committerKlaus Kurzmann <mok@fluxnetz.de>2009-11-30 11:42:46 +0100
commitc13dbddb1b40ef59d15aa483fd08c91c29da7794 (patch)
treedca92165c86fe84acdf23834d49f0935d8423584
parent8d74285207bed4528a4a7d73e55d9524f66e580c (diff)
parent1e183139c31b2ae899f9f575071e0fd9d127f090 (diff)
downloadopenembedded-c13dbddb1b40ef59d15aa483fd08c91c29da7794.tar.gz
Merge remote branch 'origin/org.openembedded.dev' into shr/merge
-rw-r--r--conf/distro/include/preferred-shr-versions.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index b2962d8770..f4ddf2fa25 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -22,7 +22,7 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.31"
# specifically set an openssh version
# NOTE: whenever changing the version here make sure
- to check we won't loose our specific config !!!
+# to check we won't loose our specific config !!!
PREFERRED_VERSION_openssh = "5.2p1"
# upgrades used in Angstrom