diff options
| author | Raimo Niskanen <[email protected]> | 2017-02-08 11:36:41 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2017-02-08 11:36:41 +0100 |
| commit | 835f29dd5bf75a25138ac723ea8644c0b4fce80c (patch) | |
| tree | a9c3c953b50b2cddd8acf2049f997d5784b1a09a /erts/vsn.mk | |
| parent | a7582454a5414232823587ee1ba58da55a87953d (diff) | |
| parent | c41a6e8a377534158b4fcaf07c5b260d80221dbd (diff) | |
| download | otp-835f29dd5bf75a25138ac723ea8644c0b4fce80c.tar.gz otp-835f29dd5bf75a25138ac723ea8644c0b4fce80c.tar.bz2 otp-835f29dd5bf75a25138ac723ea8644c0b4fce80c.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts/vsn.mk')
| -rw-r--r-- | erts/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index 028b114068..a0a991f5a9 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 8.2.1 +VSN = 8.2.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |