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 /WIN32-Code | |
| 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 'WIN32-Code')
| -rw-r--r-- | WIN32-Code/event2/event-config.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WIN32-Code/event2/event-config.h b/WIN32-Code/event2/event-config.h index 93b590a9..f2ea1fcb 100644 --- a/WIN32-Code/event2/event-config.h +++ b/WIN32-Code/event2/event-config.h @@ -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__ |