summaryrefslogtreecommitdiffstats
path: root/contrib/tcl/unix/tclUnixTime.c
diff options
context:
space:
mode:
authorpst <pst@FreeBSD.org>1997-11-27 19:52:45 +0000
committerpst <pst@FreeBSD.org>1997-11-27 19:52:45 +0000
commitedc7af1d41032004b3a4af59de18c4d7b46d8258 (patch)
treed28ad0df933472398965c6b7b10480b131520609 /contrib/tcl/unix/tclUnixTime.c
parent10ddeda1f7695845a8cf461ed2472f333c7a83c0 (diff)
downloadFreeBSD-src-edc7af1d41032004b3a4af59de18c4d7b46d8258.zip
FreeBSD-src-edc7af1d41032004b3a4af59de18c4d7b46d8258.tar.gz
Resolve merge conflicts.
Diffstat (limited to 'contrib/tcl/unix/tclUnixTime.c')
-rw-r--r--contrib/tcl/unix/tclUnixTime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/tcl/unix/tclUnixTime.c b/contrib/tcl/unix/tclUnixTime.c
index 03a7315..ba8d984 100644
--- a/contrib/tcl/unix/tclUnixTime.c
+++ b/contrib/tcl/unix/tclUnixTime.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * SCCS: @(#) tclUnixTime.c 1.12 97/01/08 17:38:15
+ * SCCS: @(#) tclUnixTime.c 1.13 97/10/31 15:04:58
*/
#include "tclInt.h"
OpenPOWER on IntegriCloud