summaryrefslogtreecommitdiff
path: root/select.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-02-10 17:33:50 -0500
committerNick Mathewson <nickm@torproject.org>2012-02-10 17:33:50 -0500
commit539466e568ab7b676eece340b43ef98cae38c97a (patch)
treeb10c11fb020560728f149b60707cb605f4db908b /select.c
parente465623a9c5ebc4bc85b7011c25d557a24a677d0 (diff)
parente49e2891292ee84e08c319bc5031fe607efc4245 (diff)
downloadlibevent-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 'select.c')
-rw-r--r--select.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/select.c b/select.c
index b482a1c7..5d284c79 100644
--- a/select.c
+++ b/select.c
@@ -2,7 +2,7 @@
/*
* Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
- * Copyright 2007-2011 Niels Provos and Nick Mathewson
+ * Copyright 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