aboutsummaryrefslogtreecommitdiff
path: root/sys/sys
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2019-03-04 19:23:11 +0000
committerDimitry Andric <dim@FreeBSD.org>2019-03-04 19:23:11 +0000
commit1791078b17f2ba4da65ea6571bbea5d9339a7c20 (patch)
treec963c99be2e84945ae36dd064f564e26d33a0e6e /sys/sys
parent844fc3e907775eabc1ed4d47c9aa036ab5b261fe (diff)
downloadsrc-1791078b17f2ba4da65ea6571bbea5d9339a7c20.tar.gz
src-1791078b17f2ba4da65ea6571bbea5d9339a7c20.zip
Set tentative merge date, and bump __FreeBSD_version.
Notes
Notes: svn path=/projects/clang800-import/; revision=344777
Diffstat (limited to 'sys/sys')
-rw-r--r--sys/sys/param.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 34f2949bd29c..62cc482a95e8 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -60,7 +60,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1300013 /* Master, propagated to newvers */
+#define __FreeBSD_version 1300014 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,