From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 10 Feb 2012 22:33:50 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=539466e568ab7b676eece340b43ef98cae38c97a;p=libevent

Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	Makefile.am
	WIN32-Code/event2/event-config.h
	configure.in
---

539466e568ab7b676eece340b43ef98cae38c97a
diff --cc WIN32-Code/event2/event-config.h
index 93b590a9,144f0acc..f2ea1fcb
--- a/WIN32-Code/event2/event-config.h
+++ b/WIN32-Code/event2/event-config.h
@@@ -334,7 -334,7 +334,13 @@@
  #define _EVENT_TIME_WITH_SYS_TIME 1
  
  /* Version number of package */
++<<<<<<< HEAD
 +#define _EVENT_VERSION "2.1.0-alpha-dev"
++||||||| merged common ancestors
++#define _EVENT_VERSION "2.0.16-stable-dev"
++=======
+ #define _EVENT_VERSION "2.0.17-stable"
++>>>>>>> origin/patches-2.0
  
  /* Define to appropriate substitue if compiler doesnt have __func__ */
  #define _EVENT___func__ __FUNCTION__
diff --cc configure.in
index b60669ba,d61390bd..0e2770fe
--- a/configure.in
+++ b/configure.in
@@@ -1,6 -1,12 +1,11 @@@
--dnl configure.in for libevent
- dnl Dug Song <dugsong@monkey.org>
+ dnl Copyright 2000-2007 Niels Provos
+ dnl Copyright 2007-2012 Niels Provos and Nick Mathewson
+ dnl
+ dnl See LICENSE for copying information.
+ dnl
+ dnl Original version Dug Song <dugsong@monkey.org>
+ 
 -AC_PREREQ(2.59c)
 +AC_PREREQ(2.59)
  AC_INIT(event.c)
  
  AC_CONFIG_MACRO_DIR([m4])