summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-05-17 20:44:51 -0300
committerRenato Botelho <renato@netgate.com>2016-05-17 20:44:51 -0300
commit41814fd21079b0bc65316a7a4678b1032d25cee6 (patch)
tree410f30e2b21a00404e2dec119a4a33d722439686 /sys/conf
parent7170d3e134d43d3c22dc7be7a626d1b4cc5297a3 (diff)
parent8a232783c3444677eb1faa3048123dda21767094 (diff)
downloadFreeBSD-src-41814fd21079b0bc65316a7a4678b1032d25cee6.zip
FreeBSD-src-41814fd21079b0bc65316a7a4678b1032d25cee6.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 5ad43e3..142bd8a 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="RELEASE-p2"
+BRANCH="RELEASE-p3"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud