aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-05-10 18:01:34 +0200
committerRickard Green <[email protected]>2017-05-10 18:01:34 +0200
commit6e4cb1248e354760d137fff297655f96cfb291cb (patch)
tree9d15cd6ad42e5e36db0dc82afae932881518ca1f /lib
parent0066f7e19efc89214724a20b3a1f3b181518fd9b (diff)
parent19e938e708bb4823d5deac94fd110b7d3896390a (diff)
downloadotp-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 'lib')
0 files changed, 0 insertions, 0 deletions