Merge branch 'master' of ssh://chromiumos-git/chromeos

This commit is contained in:
David McMahon 2009-12-09 10:37:27 -08:00
commit 20c39616b0
2 changed files with 6 additions and 6 deletions

View File

@ -26,7 +26,7 @@ export CHROMEOS_VERSION_MINOR=5
# Increment by 2 in trunk after making a release branch. # Increment by 2 in trunk after making a release branch.
# Does not reset on a major/minor change (always increases). # Does not reset on a major/minor change (always increases).
# (Trunk is always odd; branches are always even). # (Trunk is always odd; branches are always even).
export CHROMEOS_VERSION_BRANCH=23 export CHROMEOS_VERSION_BRANCH=25
# Patch number. # Patch number.
# Increment by 1 each release on a branch. # Increment by 1 each release on a branch.

View File

@ -115,7 +115,7 @@ done
# The udev daemon takes a long time to start up and settle so we defer it until # 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 # 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. # chromeos_startup script.
UDEV_DEVICES=/lib/udev/devices UDEV_DEVICES=/lib/udev/devices
mkdir "$UDEV_DEVICES"/dri mkdir "$UDEV_DEVICES"/dri