From: Denis Ovsienko <infrastation@yandex.ru>
Date: Sun, 16 Jun 2013 20:02:15 +0000 (+0400)
Subject: Merge remote-tracking branch 'bpf/master'
X-Git-Tag: tcpdump-4.5.0~73^2~3
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/05bf9bfc237231a3d10e8f160a9037efdcec70f3

Merge remote-tracking branch 'bpf/master'

Conflicts:
	Makefile.in
---

05bf9bfc237231a3d10e8f160a9037efdcec70f3
diff --cc Makefile.in
index 2b5f8ad6,a54e71c0..3fb1da8d
--- a/Makefile.in
+++ b/Makefile.in
@@@ -87,8 -87,8 +87,8 @@@ CSRC =	addrtoname.c af.c checksum.c cpa
  	print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \
          print-lmp.c print-lspping.c print-lwapp.c \
  	print-lwres.c print-mobile.c print-mpcp.c print-mpls.c print-mptcp.c print-msdp.c \
- 	print-msnlb.c print-nfs.c print-ntp.c print-null.c print-olsr.c \
- 	print-openflow.c print-openflow-1.0.c print-ospf.c \
+ 	print-msnlb.c print-nfs.c print-ntp.c print-null.c print-nflog.c \
 -	print-olsr.c print-ospf.c \
++	print-olsr.c print-openflow.c print-openflow-1.0.c print-ospf.c \
  	print-pgm.c print-pim.c \
  	print-ppi.c print-ppp.c print-pppoe.c print-pptp.c \
  	print-radius.c print-raw.c print-rip.c print-rpki-rtr.c print-rrcp.c print-rsvp.c \