diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-05-30 07:54:05 -0700 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-05-30 07:54:05 -0700 |
| commit | a608049a22dc23676c85bbf443e45cbbf0e9b83c (patch) | |
| tree | 1b82fa315337a8503390384c2684fdbb27b58294 /.gitignore | |
| parent | 775fea07517af4b68cb2ce75e25ee5af09af0f05 (diff) | |
| parent | 687fc04ea8de73eb1ec19d933c8d81f054c977dd (diff) | |
| download | conntrack-tools-a608049a22dc23676c85bbf443e45cbbf0e9b83c.tar.gz conntrack-tools-a608049a22dc23676c85bbf443e45cbbf0e9b83c.zip | |
Merge branch 'cthelper9' of git://git.netfilter.org/conntrack-tools into user_space_helpers
Conflicts:
.gitignore
src/run.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -7,6 +7,11 @@ *.deps .dirstamp libtool +Makefile +Makefile.in +*.o +*.la +*.lo /aclocal.m4 /autom4te.cache /build-stamp |