diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:51:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:51:17 -0500 |
| commit | f1de329e784e76dbb27cde148522a6c490e7cf63 (patch) | |
| tree | 3d3fea0781bfa37410a932e7d7345af25f845ea9 /Makefile.am | |
| parent | e895919b171029df4d38285b0be4483376b4ad25 (diff) | |
| parent | 1a07348a50ec679c8b7bb1abb45e61a9ebcc69a9 (diff) | |
| download | tor-f1de329e784e76dbb27cde148522a6c490e7cf63.tar.gz tor-f1de329e784e76dbb27cde148522a6c490e7cf63.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/common/test.h
src/or/test.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d03c71ff2c..eb61de7ff0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Copyright (c) 2001-2004, Roger Dingledine # Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson -# Copyright (c) 2007-2010, The Tor Project, Inc. +# Copyright (c) 2007-2011, The Tor Project, Inc. # See LICENSE for licensing information AUTOMAKE_OPTIONS = foreign |