diff options
| author | Bruce Yinhe <[email protected]> | 2014-10-15 10:13:27 +0200 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2014-10-15 10:13:27 +0200 |
| commit | f5b344378128831127026b3e18154fdf23d4713c (patch) | |
| tree | 0efdb3e0b76d47fceffa39c9e632e02ef2818257 /erts/prebuild.skip | |
| parent | 56daa687a24a26ab08434c68ca172d5bd31cfdf7 (diff) | |
| parent | 5d49d05c3604f764736b10cfb287818d4b41efda (diff) | |
| download | otp-f5b344378128831127026b3e18154fdf23d4713c.tar.gz otp-f5b344378128831127026b3e18154fdf23d4713c.tar.bz2 otp-f5b344378128831127026b3e18154fdf23d4713c.zip | |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts/prebuild.skip')
0 files changed, 0 insertions, 0 deletions