diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:59:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:59:18 -0500 |
| commit | 2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd (patch) | |
| tree | d6786b027903624576e2f8861a68e665d0fbbb9b /doc/Makefile.am | |
| parent | a29596556c60fbbf687b1af48b9e6646b25f208e (diff) | |
| parent | 5beb8ee4e1889346dc9bec5f866b14809a2d6983 (diff) | |
| download | tor-2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd.tar.gz tor-2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
configure.in
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 500a57c7b6..c8bffc9310 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -35,7 +35,7 @@ endif EXTRA_DIST = HACKING asciidoc-helper.sh \ $(html_in) $(man_in) $(txt_in) \ - tor-osx-dmg-creation.txt tor-rpm-creation.txt \ + tor-rpm-creation.txt \ tor-win32-mingw-creation.txt docdir = @docdir@ |