diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:59:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:59:18 -0500 |
| commit | 2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd (patch) | |
| tree | d6786b027903624576e2f8861a68e665d0fbbb9b /.gitignore | |
| parent | a29596556c60fbbf687b1af48b9e6646b25f208e (diff) | |
| parent | 5beb8ee4e1889346dc9bec5f866b14809a2d6983 (diff) | |
| download | tor-2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd.tar tor-2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd.tar.gz | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
configure.in
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index 6a6c14e6a..867a97d2f 100644 --- a/.gitignore +++ b/.gitignore @@ -64,16 +64,6 @@ /contrib/tor.logrotate /contrib/tor.wxs -# /contrib/osx/ -/contrib/osx/Makefile -/contrib/osx/Makefile.in -/contrib/osx/TorBundleDesc.plist -/contrib/osx/TorBundleInfo.plist -/contrib/osx/TorDesc.plist -/contrib/osx/TorInfo.plist -/contrib/osx/TorStartupDesc.plist -/contrib/osx/net.freehaven.tor.plist - # /contrib/suse/ /contrib/suse/tor.sh /contrib/suse/Makefile.in |