diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2004-01-16 20:04:21 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2004-01-16 20:04:21 +0000 |
| commit | 0ac74ed036dd796c8696b36c8905d593c1de6f26 (patch) | |
| tree | 1bd87a5c47c80ff288a6dbb847dce4e060d3bf75 /mergecap.c | |
| parent | 8f89f05a860b895de97e1becf7a0a9dc0b2bb5a7 (diff) | |
| download | wireshark-0ac74ed036dd796c8696b36c8905d593c1de6f26.tar.gz wireshark-0ac74ed036dd796c8696b36c8905d593c1de6f26.tar.bz2 wireshark-0ac74ed036dd796c8696b36c8905d593c1de6f26.zip | |
In case of CVS sources, add the date of the last change to the version
number.
2do: Add support to Makefile.nmake
Enforce the generation of cvsversion.h on each run of make
svn path=/trunk/; revision=9679
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c index a8dc435822..5abe344d53 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.11 2002/08/28 21:00:06 jmayer Exp $ + * $Id: mergecap.c,v 1.12 2004/01/16 20:03:10 jmayer Exp $ * * Written by Scott Renfro <scott@renfro.org> based on * editcap by Richard Sharpe and Guy Harris @@ -30,6 +30,7 @@ #include "getopt.h" #endif +#include "cvsversion.h" /* * Global variables @@ -444,7 +445,7 @@ main(int argc, char *argv[]) break; case 'h': - fprintf(stderr, "mergecap version %s\n", VERSION); + fprintf(stderr, "mergecap version %s%s\n", VERSION, CVSVERSION); usage(); exit(1); break; |