aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2004-07-15 21:09:33 +0000
committerGerald Combs <gerald@wireshark.org>2004-07-15 21:09:33 +0000
commit8106dc0862460d3447a5f9da6d3362a13b7344aa (patch)
treed9f5b21b77dc3f49f9decb45cadfe364bbd9fcfd /mergecap.c
parentb5384b0bd370c891b325b285411d0380a28acda0 (diff)
Convert make-version.pl and the associated cvsversion.h and CVSVERSION
definition to Subversion. "svn info" prints out the last changed date of the repository, so we don't have to go hunting through "CVS/Entries" files anymore. svn path=/trunk/; revision=11379
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mergecap.c b/mergecap.c
index 6a798e4e3e..88f7c732a4 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -31,7 +31,7 @@
#include "getopt.h"
#endif
-#include "cvsversion.h"
+#include "svnversion.h"
#include "merge.h"
#ifdef HAVE_IO_H
@@ -152,8 +152,8 @@ main(int argc, char *argv[])
case 'h':
printf("mergecap version %s"
-#ifdef CVSVERSION
- " (" CVSVERSION ")"
+#ifdef SVNVERSION
+ " (" SVNVERSION ")"
#endif
"\n", VERSION);
usage();