From 9c8a14021dd5ce2c0d6c121e35ad03f6b9ce4afe Mon Sep 17 00:00:00 2001 From: David McMahon Date: Tue, 8 Dec 2009 18:41:07 -0800 Subject: [PATCH 1/2] Created branch 24. Update CHROMEOS_VERSION_BRANCH=25 --- chromeos_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromeos_version.sh b/chromeos_version.sh index a2c64915fb..9fe4077cdb 100755 --- a/chromeos_version.sh +++ b/chromeos_version.sh @@ -31,7 +31,7 @@ export CHROMEOS_VERSION_MINOR=5 # Increment by 2 in trunk after making a release branch. # Does not reset on a major/minor change (always increases). # (Trunk is always odd; branches are always even). -export CHROMEOS_VERSION_BRANCH=23 +export CHROMEOS_VERSION_BRANCH=25 # Patch number. # Increment by 1 each release on a branch. From ea16938abe59c2a30803c60eaea56ecb5689aa1e Mon Sep 17 00:00:00 2001 From: Bill Richardson Date: Wed, 9 Dec 2009 08:42:56 -0800 Subject: [PATCH 2/2] fix typo in comment Review URL: http://codereview.chromium.org/477001 --- customize_rootfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize_rootfs.sh b/customize_rootfs.sh index 15dcaba0c7..1014d9f86d 100755 --- a/customize_rootfs.sh +++ b/customize_rootfs.sh @@ -113,7 +113,7 @@ done # The udev daemon takes a long time to start up and settle so we defer it until # after X11 has been started. In order to be able to mount the root file system -# and start X we pre-propulate some devices. These are copied into /dev by the +# and start X we pre-populate some devices. These are copied into /dev by the # chromeos_startup script. UDEV_DEVICES=/lib/udev/devices mkdir "$UDEV_DEVICES"/dri