summaryrefslogtreecommitdiff
path: root/mergecap.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2009-07-22 23:59:15 +0000
committerGerald Combs <gerald@wireshark.org>2009-07-22 23:59:15 +0000
commit1e93d53b568a8fd0769cec90ee22f85f29490ee2 (patch)
treec61b5bb801c801e54ed7a9bbe79a2ec5af2f22f7 /mergecap.c
parent0b0ff6cdcfe0541f94d00bbfb0979a421d69deda (diff)
downloadwireshark-1e93d53b568a8fd0769cec90ee22f85f29490ee2.tar.gz
Use "svn info" to fetch the version by default. Fetch the repository path as
well. Add the repository path to the version strings. svn path=/trunk/; revision=29171
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c
index 89e9740804..358ebe2359 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -89,7 +89,7 @@ usage(void)
fprintf(stderr, "Mergecap %s"
#ifdef SVNVERSION
- " (" SVNVERSION ")"
+ " (" SVNVERSION " from " SVNPATH ")"
#endif
"\n", VERSION);
fprintf(stderr, "Merge two or more capture files into one.\n");