diff options
| author | James Maki <jmaki@multitech.com> | 2010-05-18 15:58:44 -0500 |
|---|---|---|
| committer | James Maki <jmaki@multitech.com> | 2010-05-18 15:58:44 -0500 |
| commit | 5ee12e59035cd547b6cc98406b2315b5181dcbdc (patch) | |
| tree | ad8bbecc4cd0742e1b931efd98ac2234e6213697 /conf | |
| parent | 2ce8c5b66ff40942f0db0a859d954e0d70a278ef (diff) | |
| parent | 9db3b8621a20c1be4a7b13fc87c690bbe0fd8032 (diff) | |
Merge remote branch 'origin/multitech-corecdp-1.x' into multitech-corecdp-dev
Conflicts:
recipes/multitech/helloworld-autotools_git.bb
recipes/multitech/mts-io_git.bb
recipes/multitech/sms-utils_git.bb
recipes/multitech/u-boot-linux-utils_git.bb
recipes/multitech/upgrade-reboot_git.bb
recipes/multitech/venus-gps_git.bb
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/corecdp.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf index 470098125d..ef650e8836 100644 --- a/conf/distro/corecdp.conf +++ b/conf/distro/corecdp.conf @@ -11,7 +11,7 @@ require conf/amend-recipes.inc DISTRO_NAME = "CoreCDP" DISTRO = "corecdp" -DISTRO_VERSION = "2010.04" +DISTRO_VERSION = "1.0.0" DISTRO_TYPE = "release" TARGET_VENDOR = "-corecdp" BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}" |