diff options
| author | Zandra Hird <[email protected]> | 2015-07-07 15:17:10 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-07-07 15:17:10 +0200 |
| commit | 832aa9e06aced4975c9cb02257f74827602217aa (patch) | |
| tree | 4f5e5263bd6e578fe6fa2a619bfd3bec9a0c512b /erts/prebuild.skip | |
| parent | ddc7ce9124a8fb03bb95b5d550812c34f4177946 (diff) | |
| parent | 12002949e5435d19c750fe2cd8e897b4059f875a (diff) | |
| download | otp-832aa9e06aced4975c9cb02257f74827602217aa.tar.gz otp-832aa9e06aced4975c9cb02257f74827602217aa.tar.bz2 otp-832aa9e06aced4975c9cb02257f74827602217aa.zip | |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
erts/doc/src/notes.xml
erts/vsn.mk
lib/runtime_tools/doc/src/notes.xml
lib/runtime_tools/vsn.mk
otp_versions.table
Diffstat (limited to 'erts/prebuild.skip')
0 files changed, 0 insertions, 0 deletions