.gitignore

<<<<<<< HEAD
<<<<<<< HEAD
*.o
*.lo
*.la
=======
=======
>>>>>>> remotes/origin/bleedingedge
*.la
*.o
*.lo
*Makefile.in
*Makefile
*.deps
*.libs
*.swp
config\.*
configure
autom4te.cache/
depcomp
install-sh
aclocal.m4
libtool
ltmain.sh
missing
stamp-h1
docs/libtrace.doxygen
docs/doxygen
examples/parallel/network_capture
examples/parallel/timedemo
examples/parallel/trivial_skeleton
examples/rate/rate
examples/rate/rate-dir
examples/skeleton/complete
examples/skeleton/event
examples/skeleton/output
examples/skeleton/parallel
examples/skeleton/trivial
examples/stats/stats
examples/tutorial/configdemo
examples/tutorial/createdemo
examples/tutorial/filterdemo
examples/tutorial/getpayloaddemo
examples/tutorial/gettcpdemo
examples/tutorial/gettransportdemo
examples/tutorial/headerdemo
examples/tutorial/httpcount
examples/tutorial/lengthdemo
examples/tutorial/mplscount
examples/tutorial/mplstag
examples/tutorial/readdemo
examples/tutorial/sourcedemo
examples/tutorial/timedemo
examples/tutorial/writedemo
examples/tutorial/layer2-headers
lib/.dirstamp
lib/data-struct/.dirstamp
lib/libtrace.h
libpacketdump/lexer.c
libpacketdump/parser.c
libpacketdump/parser.h
m4/*.m4
test/test-autodetect
test/test-convert
test/test-convert2
test/test-datastruct-deque
test/test-datastruct-ringbuffer
test/test-datastruct-vector
test/test-decode
test/test-decode2
test/test-dir
test/test-drops
test/test-errors
test/test-event
test/test-format
test/test-format-parallel
test/test-format-parallel-hasher
test/test-format-parallel-reporter
test/test-format-parallel-singlethreaded
test/test-format-parallel-singlethreaded-hasher
test/test-format-parallel-stressthreads
test/test-fragment
test/test-live
test/test-live-snaplen
test/test-pcap-bpf
test/test-plen
test/test-ports
test/test-setcaplen
test/test-time
test/test-tracetime-parallel
test/test-vxlan
test/test-wireless
test/test-write
test/*.dSYM/
test/DPDK_source/
test/DPDK_builds/
tools/traceanon/traceanon
tools/traceanon/traceanon_parallel
tools/tracediff/tracediff
tools/traceends/traceends
tools/tracemerge/tracemerge
tools/tracepktdump/tracepktdump
tools/tracereplay/tracereplay
tools/tracereport/tracereport
tools/tracertstats/tracertstats
tools/tracertstats/tracertstats_parallel
tools/tracesplit/tracesplit
tools/tracesplit/tracesplit_dir
tools/tracestats/tracestats
tools/tracetop/tracetop
tools/tracemcast/tracemcast
ylwrap
<<<<<<< HEAD

.vscode*
>>>>>>> upstream/master
=======
>>>>>>> remotes/origin/bleedingedge