diff options
author | Daniel Borkmann <dborkman@redhat.com> | 2013-05-15 11:29:34 +0200 |
---|---|---|
committer | Daniel Borkmann <dborkman@redhat.com> | 2013-05-15 11:29:34 +0200 |
commit | 2febd57f87eb4d994481d981370c0cd051754539 (patch) | |
tree | db4661560350298712243831931ca354483bf294 /ifpps.c | |
parent | 3c6e23848af9d0798b98d9f022b7086605f11e99 (diff) | |
parent | 84d5f6dd4987bb78f85a706b0fc689d5b51bbba0 (diff) |
Merge branch 'master' of github.com:borkmann/netsniff-ng
Conflicts resolved by hand:
bpfc.8
ifpps.8
netsniff-ng.8
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'ifpps.c')
-rw-r--r-- | ifpps.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -105,8 +105,8 @@ static void help(void) " -p|--promisc Promiscuous mode\n" " -c|--csv Output to terminal as Gnuplot-ready data\n" " -l|--loop Continuous CSV output\n" - " -v|--version Print version\n" - " -h|--help Print this help\n\n" + " -v|--version Print version and exit\n" + " -h|--help Print this help and exit\n\n" "Examples:\n" " ifpps eth0\n" " ifpps -pd eth0\n" |