From 17adef6fc2c4e94e120f950da15768ec2fbd15e6 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Tue, 12 Nov 1996 09:11:51 +0000
Subject: Mega-merge from -current

---
 sys/conf/newvers.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sys/conf/newvers.sh')

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 00585dcbc5e3..657fe4ff552a 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,10 +32,10 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-#	$Id: newvers.sh,v 1.26 1996/10/11 14:35:10 jkh Exp $
+#	$Id: newvers.sh,v 1.27 1996/11/03 12:04:05 phk Exp $
 
 TYPE="FreeBSD"
-REVISION="2.2"
+REVISION="3.0"
 BRANCH="CURRENT"
 RELEASE="${REVISION}-${BRANCH}"
 SNAPDATE=""
@@ -44,7 +44,7 @@ if [ "X${SNAPDATE}" != "X" ]; then
 fi
 VERSION="${TYPE} ${RELEASE}"
 
-RELDATE="199612"
+RELDATE="199701"
 
 b=share/examples/etc/bsd-style-copyright
 year=`date '+%Y'`
-- 
cgit v1.3