diff options
author | Renato Botelho <renato@netgate.com> | 2017-04-26 17:58:09 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2017-04-26 17:58:09 -0300 |
commit | 07324460536d4fea98778edbb99e88f512dd3a6c (patch) | |
tree | 7abe9cde8c3df456554a2e29b40a39ffd4a1e9c0 /sys/conf | |
parent | 1d2c919ef6b6d7b9e78890cea95a129a17d61930 (diff) | |
parent | b8126de23e957978b4d0403097cd8402f0c1d82a (diff) | |
download | FreeBSD-src-07324460536d4fea98778edbb99e88f512dd3a6c.zip FreeBSD-src-07324460536d4fea98778edbb99e88f512dd3a6c.tar.gz |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/newvers.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 0cf9277..a67acf9 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.3" -BRANCH="RELEASE-p17" +BRANCH="RELEASE-p18" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |