diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 17:53:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 17:53:09 -0500 |
| commit | 596f7a39b69c5c3c5f2427e65056af6cc2bb0f64 (patch) | |
| tree | 3c62277a4e39bb58f7f8c952a25b7dcf0b837a5c | |
| parent | 06deec15c9ecb7c40e3f7f8e05be887ab0705877 (diff) | |
| parent | 10ad3442e11fb5a54c19eef7425bc317a9cc0969 (diff) | |
| download | tor-596f7a39b69c5c3c5f2427e65056af6cc2bb0f64.tar.gz tor-596f7a39b69c5c3c5f2427e65056af6cc2bb0f64.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
configure.in
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 9cbfbb1ca5..f30402d5b5 100644 --- a/configure.in +++ b/configure.in @@ -946,7 +946,7 @@ fi CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib" -AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) +AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) AC_OUTPUT if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then |