diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:53:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:53:53 -0500 |
| commit | 5beb8ee4e1889346dc9bec5f866b14809a2d6983 (patch) | |
| tree | 2ef957c8a4a8cf7ba5f88be038e54ca764499e42 /.gitignore | |
| parent | 362bb5c625b831095e1d9dae1c348131257afab4 (diff) | |
| parent | fcdf1470c04b5ef19a7b9d28a48401f4d5c17293 (diff) | |
| download | tor-5beb8ee4e1889346dc9bec5f866b14809a2d6983.tar.gz tor-5beb8ee4e1889346dc9bec5f866b14809a2d6983.zip | |
Merge remote branch 'sebastian/remove-osx-expert-package' into maint-0.2.2
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index b5d4442ca6..673bb7871d 100644 --- a/.gitignore +++ b/.gitignore @@ -63,16 +63,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 |