diff options
| author | Henrik Nord <[email protected]> | 2015-12-18 12:25:03 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-12-18 12:25:03 +0100 |
| commit | fc3ec3e298b8908a7065297c7a824de5eec13a51 (patch) | |
| tree | 6a356bb53a8400cd8e561740b43e8a0b27a57aff /OTP_VERSION | |
| parent | e6a733c5a903fafb52b73f7813fed72e4e29be6c (diff) | |
| parent | 21d6192389a04024f7a41ced9d0911a9cce6f4e8 (diff) | |
| download | otp-fc3ec3e298b8908a7065297c7a824de5eec13a51.tar.gz otp-fc3ec3e298b8908a7065297c7a824de5eec13a51.tar.bz2 otp-fc3ec3e298b8908a7065297c7a824de5eec13a51.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
erts/vsn.mk
Diffstat (limited to 'OTP_VERSION')
0 files changed, 0 insertions, 0 deletions