summaryrefslogtreecommitdiff
path: root/evport.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 /evport.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 'evport.c')
-rw-r--r--evport.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/evport.c b/evport.c
index 50f065a6..511f8d68 100644
--- a/evport.c
+++ b/evport.c
@@ -1,6 +1,9 @@
/*
* Submitted by David Pacheco (dp.spambait@gmail.com)
*
+ * Copyright 2006-2007 Niels Provos
+ * 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
* are met: