summaryrefslogtreecommitdiffstats
path: root/sys/sys
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-12-30 16:21:07 -0200
committerRenato Botelho <renato@netgate.com>2015-12-30 16:21:07 -0200
commitd8ff3484131f428fcc0727cd504acb5050a36490 (patch)
tree8adfbb5b779f497e621d29277fcbe1536012eeb0 /sys/sys
parent0319542cc712df59c57f014b4f925f516bcb5b4b (diff)
parentecf8336fcdf81e2aeb30a7ab82841dd7299ceb98 (diff)
downloadFreeBSD-src-d8ff3484131f428fcc0727cd504acb5050a36490.zip
FreeBSD-src-d8ff3484131f428fcc0727cd504acb5050a36490.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
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 3acaad7..e58c77e 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1002504 /* Master, propagated to newvers */
+#define __FreeBSD_version 1002505 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
OpenPOWER on IntegriCloud