diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-08-09 18:09:24 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-08-09 18:09:24 +0000 |
| commit | 3c5182ca6f3c3cb0d292743e65788c0b1d03b596 (patch) | |
| tree | ce06699ce301f16462183fd654a57d38793a6ee4 /sys | |
| parent | 069768bdb70fb3052599d3e70898a0ed0e1c31d2 (diff) | |
move to 3.6-beta
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/macppc/stand/tbxidata/bsd.tbxi | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 8 | ||||
| -rw-r--r-- | sys/sys/param.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi index b451cc7bf08..222b2e2b5fd 100644 --- a/sys/arch/macppc/stand/tbxidata/bsd.tbxi +++ b/sys/arch/macppc/stand/tbxidata/bsd.tbxi @@ -1,6 +1,6 @@ <CHRP-BOOT> <LICENSE> -/* $OpenBSD: bsd.tbxi,v 1.11 2004/02/27 18:02:47 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.12 2004/08/09 18:09:23 deraadt Exp $ */ /* * Copyright (c) 2001 Dale Rahn. * All rights reserved. @@ -34,7 +34,7 @@ MacRISC MacRISC3 OpenBSD/macppc bootloader </DESCRIPTION> <BOOT-SCRIPT> -boot cd:,ofwboot /3.5/macppc/bsd.rd +boot cd:,ofwboot /3.6/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 8eb3a4c1461..e12b227bae7 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.62 2004/04/05 08:34:10 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.63 2004/08/09 18:08:50 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -66,12 +66,12 @@ id=`basename ${d}` # A month or so before release, select STATUS "-beta" ost="OpenBSD" -osr="3.5" +osr="3.6" cat >vers.c <<eof -#define STATUS "-current" -#if 0 #define STATUS "-beta" +#if 0 +#define STATUS "-current" #define STATUS "" /* release */ #endif diff --git a/sys/sys/param.h b/sys/sys/param.h index 68651439d80..e72d1a1c9ba 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.55 2004/05/31 18:35:35 millert Exp $ */ +/* $OpenBSD: param.h,v 1.56 2004/08/09 18:08:50 deraadt Exp $ */ /* $NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $ */ /*- @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 200405 /* OpenBSD version (year & month). */ -#define OpenBSD3_5 1 /* OpenBSD 3.5 */ +#define OpenBSD 2001005 /* OpenBSD version (year & month). */ +#define OpenBSD3_6 1 /* OpenBSD 3.6 */ #ifndef NULL #ifdef __GNUG__ |