diff options
| author | Raimo Niskanen <[email protected]> | 2017-02-08 11:35:18 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2017-02-08 11:35:18 +0100 |
| commit | c41a6e8a377534158b4fcaf07c5b260d80221dbd (patch) | |
| tree | 0bb33b29b50df7778f281270832a323fab5c3a58 /erts/vsn.mk | |
| parent | 83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb (diff) | |
| parent | aa315e1cf1b79ab782e5b4c944595495ebf4e2f4 (diff) | |
| download | otp-c41a6e8a377534158b4fcaf07c5b260d80221dbd.tar.gz otp-c41a6e8a377534158b4fcaf07c5b260d80221dbd.tar.bz2 otp-c41a6e8a377534158b4fcaf07c5b260d80221dbd.zip | |
Merge branch 'maint-19' into 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 |