From 4088083ae6cf0b8923826cc108a729bcbf060164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=BCxen?= <tuexen@fh-muenster.de>
Date: Wed, 25 Apr 2012 19:21:25 +0000
Subject: Fix typo.

svn path=/trunk/; revision=42239
---
 mergecap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mergecap.c')

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);
-- 
cgit v1.2.1