diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 17:25:30 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 17:25:30 -0500 |
| commit | fd8f7991e47d02cc345af6f190a7b480703822df (patch) | |
| tree | d8b85b760feeca52e57bd8da9d768ad7c124cc4e /Makefile.am | |
| parent | a87a55a9b692ab9f039be15f8af59a159b52d8f2 (diff) | |
| parent | 0e9d7f105d217e88b87058fabb31c94e4f72762c (diff) | |
| download | tor-fd8f7991e47d02cc345af6f190a7b480703822df.tar tor-fd8f7991e47d02cc345af6f190a7b480703822df.tar.gz | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 1d09ead1f..0daca63e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,8 +4,8 @@ # See LICENSE for licensing information # "foreign" means we don't follow GNU package layout standards -# 1.6 means we require automake vesion 1.6 -AUTOMAKE_OPTIONS = foreign 1.6 +# 1.7 means we require automake vesion 1.7 +AUTOMAKE_OPTIONS = foreign 1.7 SUBDIRS = src doc contrib |