diff options
| author | Gerald Combs <gerald@wireshark.org> | 2004-02-20 20:36:14 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2004-02-20 20:36:14 +0000 |
| commit | 058dbba4b931cf8909483679c3fa8fe9c3e71487 (patch) | |
| tree | 3a2655b7934da3ed5a8e6715faba7552c9b666ca /mergecap.c | |
| parent | 0a6078c1a2818889c587f0760c940753bc540ce0 (diff) | |
| download | wireshark-058dbba4b931cf8909483679c3fa8fe9c3e71487.tar.gz wireshark-058dbba4b931cf8909483679c3fa8fe9c3e71487.tar.bz2 wireshark-058dbba4b931cf8909483679c3fa8fe9c3e71487.zip | |
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
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 <scott@renfro.org> 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(); |