diff options
author | Renato Botelho <renato@netgate.com> | 2017-01-09 12:11:29 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2017-01-09 12:11:29 -0200 |
commit | 583cd464636b9a6cfccc531961c9485848ef5ebc (patch) | |
tree | 3f0da9de78f683ce052e013172f4e718a77e8127 /sys | |
parent | d20b9916a16a3507b076e4764566a9641f9e973a (diff) | |
parent | 570e4ab90f4cd78ac7fef92fbb56aab29321dc2c (diff) | |
download | FreeBSD-src-583cd464636b9a6cfccc531961c9485848ef5ebc.zip FreeBSD-src-583cd464636b9a6cfccc531961c9485848ef5ebc.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 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 3dffb6b..1781f13 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.3" -BRANCH="RELEASE-p12" +BRANCH="RELEASE-p15" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |