diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-02-10 17:33:50 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-02-10 17:33:50 -0500 |
commit | 539466e568ab7b676eece340b43ef98cae38c97a (patch) | |
tree | b10c11fb020560728f149b60707cb605f4db908b /log-internal.h | |
parent | e465623a9c5ebc4bc85b7011c25d557a24a677d0 (diff) | |
parent | e49e2891292ee84e08c319bc5031fe607efc4245 (diff) | |
download | libevent-539466e568ab7b676eece340b43ef98cae38c97a.tar.gz |
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts:
Makefile.am
WIN32-Code/event2/event-config.h
configure.in
Diffstat (limited to 'log-internal.h')
-rw-r--r-- | log-internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/log-internal.h b/log-internal.h index a14cc3b9..4e0fede0 100644 --- a/log-internal.h +++ b/log-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |