From 09db3d67a24d3c2c9cc8e4176832bec765c2ac1f Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Sat, 16 Jul 2011 17:08:52 +0000
Subject: [PATCH] finish merging from R40-stable; set version number to
 yesterday though

---
 check.t | 4 ++--
 sh.h    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/check.t b/check.t
index 0a743a6..adebca8 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.475 2011/07/16 17:08:35 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.476 2011/07/16 17:08:50 tg Exp $
 # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@@ -25,7 +25,7 @@
 # http://www.research.att.com/~gsf/public/ifs.sh
 
 expected-stdout:
-	@(#)MIRBSD KSH R40 2011/07/07
+	@(#)MIRBSD KSH R40 2011/07/15
 description:
 	Check version of shell.
 stdin:
diff --git a/sh.h b/sh.h
index 422786a..7e29aa7 100644
--- a/sh.h
+++ b/sh.h
@@ -151,9 +151,9 @@
 #endif
 
 #ifdef EXTERN
-__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.486 2011/07/16 17:08:21 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.487 2011/07/16 17:08:52 tg Exp $");
 #endif
-#define MKSH_VERSION "R40 2011/07/07"
+#define MKSH_VERSION "R40 2011/07/15"
 
 #ifndef MKSH_INCLUDES_ONLY