diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-08 15:08:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-08 15:08:51 -0400 |
| commit | 781b477bc8af868661450473cdebb5d70312fd61 (patch) | |
| tree | 3e45e27de1cb779b15f6cfeca0a14fe9407bfda2 | |
| parent | 54348201f7cce9c0c01e9d4835714a2fec55c67c (diff) | |
| parent | f551a053e35a937da2e01d382639e79f1e6d2369 (diff) | |
| download | tor-781b477bc8af868661450473cdebb5d70312fd61.tar.gz tor-781b477bc8af868661450473cdebb5d70312fd61.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index de1eb04694..1a479903dc 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,8 @@ # Python droppings *.pyc *.pyo +# Cscope +cscope.* # / /Makefile |