summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-11-02 10:47:24 -0200
committerRenato Botelho <renato@netgate.com>2016-11-02 10:47:24 -0200
commitf3b07992fce8a61008ffdc893fde2b53fef7acba (patch)
tree28fbaae043c1906469d04a7ac2bca8a6fd982875 /sys/conf
parentdf5338698255767af680591ff274814676493ffb (diff)
parent2f81d935658287026e614a5edf74ae47f5c54f3f (diff)
downloadFreeBSD-src-f3b07992fce8a61008ffdc893fde2b53fef7acba.zip
FreeBSD-src-f3b07992fce8a61008ffdc893fde2b53fef7acba.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.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index a12fc8c..3dffb6b 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="RELEASE-p10"
+BRANCH="RELEASE-p12"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud