From 058dbba4b931cf8909483679c3fa8fe9c3e71487 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 20 Feb 2004 20:36:14 +0000 Subject: Add support for a "version.conf" file in the main directory which can be used to adjust version preferences. It understands two configuration directives: "enable", which can be 0 or 1, and "format", which can be any strftime()-compatible string, e.g. "V12-powered on %A %Y-%m-%d %H:%M:%S". If no configuration file is present, the configuration defaults to enable: 1 format: CVS %Y%m%d%H%M%S svn path=/trunk/; revision=10139 --- mergecap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mergecap.c') diff --git a/mergecap.c b/mergecap.c index ca36f06b56..d5e9534cd5 100644 --- a/mergecap.c +++ b/mergecap.c @@ -1,6 +1,6 @@ /* Combine two dump files, either by appending or by merging by timestamp * - * $Id: mergecap.c,v 1.17 2004/01/25 22:21:39 guy Exp $ + * $Id: mergecap.c,v 1.18 2004/02/20 20:36:13 gerald Exp $ * * Written by Scott Renfro based on * editcap by Richard Sharpe and Guy Harris @@ -469,7 +469,7 @@ main(int argc, char *argv[]) case 'h': printf("mergecap version %s" #ifdef CVSVERSION - " (cvs " CVSVERSION ")" + " (" CVSVERSION ")" #endif "\n", VERSION); usage(); -- cgit v1.2.1