diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-04 21:40:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-04 21:40:55 -0400 |
| commit | e40bafe796a8e544e9e54e247cb3aa30c95e06b0 (patch) | |
| tree | c7e2e1a750d3a0be1714194795df2a20c0cfa3d6 /Makefile.am | |
| parent | 8254de765d80a750898de67e61dcc627dceaf80f (diff) | |
| parent | 60c1426f2c16ffe1e4e14b4779e335d824f64aee (diff) | |
| download | libevent-e40bafe796a8e544e9e54e247cb3aa30c95e06b0.tar.gz | |
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts:
Makefile.am
WIN32-Code/event2/event-config.h
configure.in
test/regress_ssl.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 749d4427..dae46c24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,20 @@ RELEASE = -release 2.1 VERSION_INFO = 1:0:0 # History: RELEASE VERSION_INFO +# 2.0.1-alpha -- 2.0 1:0:0 +# 2.0.2-alpha -- 2:0:0 +# 2.0.3-alpha -- 2:0:0 (should have incremented; didn't.) +# 2.0.4-alpha -- 3:0:0 +# 2.0.5-beta -- 4:0:0 +# 2.0.6-rc -- 2.0 2:0:0 +# 2.0.7-rc -- 2.0 3:0:1 +# 2.0.8-rc -- 2.0 4:0:2 +# 2.0.9-rc -- 2.0 5:0:0 (ABI changed slightly) +# 2.0.10-stable-- 2.0 5:1:0 (No ABI change) +# 2.0.11-stable-- 2.0 6:0:1 (ABI changed, backward-compatible) +# 2.0.12-stable-- 2.0 6:1:1 (No ABI change) +# +# For Libevent 2.1: # 2.1.1-alpha -- 2.1 1:0:0 |