diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-16 04:10:25 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-16 04:10:25 +0000 |
| commit | ff868427efdd090e057f520d980556e3634ddb90 (patch) | |
| tree | 8492a777b800482dffae6c0215b5924c725224e8 /wiretap | |
| parent | 44e4c933de0fb566d1652c3ff170fd36af726b91 (diff) | |
| download | wireshark-ff868427efdd090e057f520d980556e3634ddb90.tar.gz | |
Include merge.h, so it shows up in the distribution tarball.
svn path=/trunk/; revision=50662
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/Makefile.common | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wiretap/Makefile.common b/wiretap/Makefile.common index eb54501c61..b03904fe27 100644 --- a/wiretap/Makefile.common +++ b/wiretap/Makefile.common @@ -113,6 +113,7 @@ NONGENERATED_HEADER_FILES = \ k12.h \ lanalyzer.h \ libpcap.h \ + merge.h \ mpeg.h \ mpeg.h \ mp2t.h \ |