summaryrefslogtreecommitdiff
path: root/mergecap.c
diff options
context:
space:
mode:
authorMichael Tüxen <tuexen@fh-muenster.de>2012-04-25 19:21:25 +0000
committerMichael Tüxen <tuexen@fh-muenster.de>2012-04-25 19:21:25 +0000
commit4088083ae6cf0b8923826cc108a729bcbf060164 (patch)
treeca1fc503827461d4054b01ea3d53bfc4228db250 /mergecap.c
parent27a21cd04d9a374f348f70ad41ea0a9b2d7b46c8 (diff)
downloadwireshark-4088083ae6cf0b8923826cc108a729bcbf060164.tar.gz
Fix typo.
svn path=/trunk/; revision=42239
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 5d741f7727..3eeb52dff3 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -393,7 +393,7 @@ main(int argc, char *argv[])
int i;
shb_hdr = g_new(wtapng_section_t,1);
- comment_gstr = g_string_new("File created my merging: \n");
+ comment_gstr = g_string_new("File created by merging: \n");
for (i = 0; i < in_file_count; i++) {
g_string_append_printf(comment_gstr, "File%d: %s \n",i+1,in_files[i].filename);