finish merging from R40-stable; set version number to yesterday though

This commit is contained in:
tg 2011-07-16 17:08:52 +00:00
parent 620faa3dc9
commit 09db3d67a2
2 changed files with 4 additions and 4 deletions

View File

@ -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:

4
sh.h
View File

@ -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