diff options
| author | Rickard Green <[email protected]> | 2017-05-10 18:01:34 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-05-10 18:01:34 +0200 |
| commit | 6e4cb1248e354760d137fff297655f96cfb291cb (patch) | |
| tree | 9d15cd6ad42e5e36db0dc82afae932881518ca1f /erts/lib/internal | |
| parent | 0066f7e19efc89214724a20b3a1f3b181518fd9b (diff) | |
| parent | 19e938e708bb4823d5deac94fd110b7d3896390a (diff) | |
| download | otp-6e4cb1248e354760d137fff297655f96cfb291cb.tar.gz otp-6e4cb1248e354760d137fff297655f96cfb291cb.tar.bz2 otp-6e4cb1248e354760d137fff297655f96cfb291cb.zip | |
Merge branch 'maint-18' into maint
* maint-18:
Updated OTP version
Prepare release
Conflicts:
erts/doc/src/notes.xml
Diffstat (limited to 'erts/lib/internal')
0 files changed, 0 insertions, 0 deletions