diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-10 15:03:35 -0700 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-10 15:03:35 -0700 |
| commit | 48056fa49608bedc4c076181478485569fec7d5f (patch) | |
| tree | 3d60586d43ec504d7018af00ba7cf1d895e3f099 /include/linux/Makefile.am | |
| parent | 4decf5460114e222532147ccc97fbec05bc5cccb (diff) | |
| parent | 5bbd235a4a30b26f477b73b2779619a5f20ad73b (diff) | |
| download | conntrack-tools-48056fa49608bedc4c076181478485569fec7d5f.tar.gz conntrack-tools-48056fa49608bedc4c076181478485569fec7d5f.zip | |
Merge branch 'pacifica' into oxnard
Conflicts:
.frlog
debian/changelog
Diffstat (limited to 'include/linux/Makefile.am')
| -rw-r--r-- | include/linux/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am new file mode 100644 index 0000000..38eb109 --- /dev/null +++ b/include/linux/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = netfilter |