PERFORCE change 59943 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=59943

Change 59943 by peter at peter_daintree on 2004/08/18 00:28:37

	IFC @59942  (6.0-current!)

Affected files ...

.. //depot/projects/hammer/sys/conf/newvers.sh#12 integrate
.. //depot/projects/hammer/sys/sys/param.h#41 integrate

Differences ...

==== //depot/projects/hammer/sys/conf/newvers.sh#12 (text+ko) ====

@@ -28,10 +28,10 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.62 2004/07/01 06:40:12 ps Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.63 2004/08/18 00:21:12 scottl Exp $
 
 TYPE="FreeBSD"
-REVISION="5.2"
+REVISION="6.0"
 BRANCH="CURRENT"
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"

==== //depot/projects/hammer/sys/sys/param.h#41 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.209 2004/08/08 03:21:37 alfred Exp $
+ * $FreeBSD: src/sys/sys/param.h,v 1.210 2004/08/18 00:21:12 scottl Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -55,7 +55,7 @@
  * scheme is:  <major><two digit minor><0 if release branch, otherwise 1>xx
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 502128	/* Master, propagated to newvers */
+#define __FreeBSD_version 600000	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>