Index: stable/10/tools/build/options/WITH_SSP
===================================================================
--- stable/10/tools/build/options/WITH_SSP	(nonexistent)
+++ stable/10/tools/build/options/WITH_SSP	(revision 311552)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build world with propolice stack smashing protection.

Property changes on: stable/10/tools/build/options/WITH_SSP
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: stable/10
===================================================================
--- stable/10	(revision 311551)
+++ stable/10	(revision 311552)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
   Merged /head:r311136
   Merged /stable/11:r311551