diff options
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__ |