diff options
author | Zandra Hird <zandra@erlang.org> | 2015-04-23 12:43:39 +0200 |
---|---|---|
committer | Zandra Hird <zandra@erlang.org> | 2015-04-23 12:43:39 +0200 |
commit | 1756ef6ea4af36e061cdde92d1a87b3b225edea7 (patch) | |
tree | f5c04ce173d66371e30e978e7ee7dddc6527fab2 /erts | |
parent | b3ad09ba107de16259844fe5bc50898ae40a1a96 (diff) | |
parent | ff1e0b2fe44a347670a5d72c45c061fefa6abc7f (diff) | |
download | otp-1756ef6ea4af36e061cdde92d1a87b3b225edea7.tar.gz otp-1756ef6ea4af36e061cdde92d1a87b3b225edea7.tar.bz2 otp-1756ef6ea4af36e061cdde92d1a87b3b225edea7.zip |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions