diff options
| author | Renato Botelho <renato@netgate.com> | 2016-03-04 09:40:29 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-03-04 09:40:29 -0300 |
| commit | ac327b58ab68ee832ddcbbadfcbc6adc5d356cb8 (patch) | |
| tree | e04090dcf9f53b3375b670d71a1b43e5902aee42 /sys | |
| parent | 1f35e43df1094ff19ecabbd0066238226407f832 (diff) | |
| parent | c7e729e17dd576bdb128a6846969f5d29e5de93e (diff) | |
| download | FreeBSD-src-ac327b58ab68ee832ddcbbadfcbc6adc5d356cb8.zip FreeBSD-src-ac327b58ab68ee832ddcbbadfcbc6adc5d356cb8.tar.gz | |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/sys/param.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 68556dd..df4b9e4 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.3" -BRANCH="BETA3" +BRANCH="RC1" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/sys/sys/param.h b/sys/sys/param.h index f1786f4..15c31d6 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1002509 /* Master, propagated to newvers */ +#define __FreeBSD_version 1003000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, |
