aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-28 11:59:55 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-28 11:59:55 -0400
commit703ad69587b512088f178da52494d7767f521c38 (patch)
treeb4209f96d7494bdf2dbb9af74549ed83d291579e /.gitignore
parent9230bc7c65cec68c66fa9c75751d6c6bd600e9fc (diff)
downloadtor-703ad69587b512088f178da52494d7767f521c38.tar
tor-703ad69587b512088f178da52494d7767f521c38.tar.gz
Deal with the aftermath of sorting contrib
This basically amounts to grepping for every file that mentioned contrib and adjusting its references to refer to the right place.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore19
1 files changed, 5 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 35a6c0010..71737cf1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
*.bak
# Python droppings
*.pyc
+*.pyo
# /
/Makefile
@@ -60,20 +61,10 @@
/tor-*-win32.exe
# /contrib/
-/contrib/Makefile
-/contrib/Makefile.in
-/contrib/tor.sh
-/contrib/torctl
-/contrib/torify
-/contrib/*.pyc
-/contrib/*.pyo
-/contrib/tor.logrotate
-/contrib/tor.wxs
-
-# /contrib/suse/
-/contrib/suse/tor.sh
-/contrib/suse/Makefile.in
-/contrib/suse/Makefile
+/contrib/dist/tor.sh
+/contrib/dist/torctl
+/contrib/operator-tools/tor.logrotate
+/contrib/dist/suse/tor.sh
# /debian/
/debian/files