summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2005-07-11 08:34:49 +0000
committerscottl <scottl@FreeBSD.org>2005-07-11 08:34:49 +0000
commitcab029400db3fc2b294c6d41f5105a67206a718e (patch)
treea5f83f2c23d8f216af10d1ae4b3dddc8a9717930 /sys
parent531103fe3ea5b3af1c9526870be6f0c14b574de8 (diff)
downloadFreeBSD-src-cab029400db3fc2b294c6d41f5105a67206a718e.zip
FreeBSD-src-cab029400db3fc2b294c6d41f5105a67206a718e.tar.gz
Make the RELENG_6 branch operation official by moving HEAD to 7.0-CURRENT.
Approved by: re
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/sys/param.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 1acd83b..99367b4 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -31,7 +31,7 @@
# $FreeBSD$
TYPE="FreeBSD"
-REVISION="6.0"
+REVISION="7.0"
BRANCH="CURRENT"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 0cc9a0e..82311dc 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -57,7 +57,7 @@
* is created, otherwise 1.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 600032 /* Master, propagated to newvers */
+#define __FreeBSD_version 700000 /* Master, propagated to newvers */
#ifndef LOCORE
#include <sys/types.h>
OpenPOWER on IntegriCloud