diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-30 16:22:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-30 16:22:39 -0400 |
| commit | 495e630a498fc4121a9852cad100af41e708cd4c (patch) | |
| tree | 7c5209ab9c5a6544b47ee081190262a86891c793 /.gitignore | |
| parent | d39e46c26d6992dcd019fa159981c057c3d24716 (diff) | |
| parent | 0e9d969bb2bb4bb9a5f7db1db824c729d7142cbc (diff) | |
| download | tor-495e630a498fc4121a9852cad100af41e708cd4c.tar tor-495e630a498fc4121a9852cad100af41e708cd4c.tar.gz | |
Merge branch 'tor-fw-squashed2'
Conflicts:
src/common/util.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b5d4442ca..c0decec98 100644 --- a/.gitignore +++ b/.gitignore @@ -161,6 +161,12 @@ /src/tools/Makefile /src/tools/Makefile.in +# /src/tools/tor-fw-helper/ +/src/tools/tor-fw-helper/tor-fw-helper +/src/tools/tor-fw-helper/tor-fw-helper.exe +/src/tools/tor-fw-helper/Makefile +/src/tools/tor-fw-helper/Makefile.in + # /src/win32/ /src/win32/Makefile /src/win32/Makefile.in |