diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2012-09-30 23:34:04 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@inai.de> | 2012-09-30 23:38:58 +0200 |
| commit | 4c1a015e201c6e5192448cbcf1975dd7630cad82 (patch) | |
| tree | 30ee606da82b0cbcb11ebb303196afb29f4e65e7 /iptables/.gitignore | |
| parent | ec40b897289745da3d67de2cb14be30353003922 (diff) | |
| parent | 7b5ba43ae48c1310e5a615cf9485c1d42f486467 (diff) | |
Merge branch 'master' of git://git.inai.de/iptables
Conflicts:
extensions/GNUmakefile.in
Resolution: trivial, since this was a fuzz 3.
Reason: Line added from v1.4.15-16-g33710a5 was in vincinity of changes
from v1.4.15-22-g4496801.
Diffstat (limited to 'iptables/.gitignore')
| -rw-r--r-- | iptables/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/iptables/.gitignore b/iptables/.gitignore index 5a089376..4fc63aa4 100644 --- a/iptables/.gitignore +++ b/iptables/.gitignore @@ -5,6 +5,7 @@ /ip6tables-static /iptables /iptables.8 +/iptables-extensions.8 /iptables-save /iptables-restore /iptables-static |