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 /bufferevent_pair.c | |
| 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 'bufferevent_pair.c')
| -rw-r--r-- | bufferevent_pair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bufferevent_pair.c b/bufferevent_pair.c index 271e305d..6d370733 100644 --- a/bufferevent_pair.c +++ b/bufferevent_pair.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos, Nick Mathewson + * Copyright (c) 2009-2012 Niels Provos, Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |