diff options
| author | Lars Thorsen <[email protected]> | 2011-09-26 10:27:50 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2011-09-26 10:27:50 +0200 |
| commit | f8a45f101ef47ff9d1e7f51e1989661ab8114107 (patch) | |
| tree | 4a212467c9f4719078e80170d60b82aa1ec71611 /lib/megaco/vsn.mk | |
| parent | 1ead5e977d307ae391fdfd34e28fa5d587db2855 (diff) | |
| parent | 3992f3308fd2d84e46f930e4181ee29d2389ff96 (diff) | |
| download | otp-f8a45f101ef47ff9d1e7f51e1989661ab8114107.tar.gz otp-f8a45f101ef47ff9d1e7f51e1989661ab8114107.tar.bz2 otp-f8a45f101ef47ff9d1e7f51e1989661ab8114107.zip | |
Merge branch 'dev' into major
* dev:
[erl_docgen] Missing header level in PDF bookmarks menu
Fixed version, release notes and appup in prep for release.
Fix lost wakeup of scheduler when enqueuing auxiliary work
Diffstat (limited to 'lib/megaco/vsn.mk')
| -rw-r--r-- | lib/megaco/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk index 5f71712360..c1476488ca 100644 --- a/lib/megaco/vsn.mk +++ b/lib/megaco/vsn.mk @@ -18,6 +18,6 @@ # %CopyrightEnd% APPLICATION = megaco -MEGACO_VSN = 3.15.1 +MEGACO_VSN = 3.15.1.1 PRE_VSN = APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)" |