diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 17:55:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 17:55:17 -0500 |
| commit | c2f111a631292b38b25635334afd628cb1024265 (patch) | |
| tree | a6c50c391ebf80ec6e7d59009d57ce0ca96fc205 /configure.in | |
| parent | bbf782dc13915c579396d94efbdf87b5c32b70d3 (diff) | |
| parent | 596f7a39b69c5c3c5f2427e65056af6cc2bb0f64 (diff) | |
| download | tor-c2f111a631292b38b25635334afd628cb1024265.tar.gz tor-c2f111a631292b38b25635334afd628cb1024265.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
configure.in
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 2669511430..d7cb91f51e 100644 --- a/configure.in +++ b/configure.in @@ -1165,7 +1165,6 @@ AC_CONFIG_FILES([ contrib/torctl contrib/torify doc/Makefile - doc/spec/Makefile src/Makefile src/common/Makefile src/config/Makefile |