diff options
| author | Henrik Nord <[email protected]> | 2015-10-01 14:57:57 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-10-01 15:13:47 +0200 |
| commit | c1d11c28ca748075cae5330102bccd10a56b8686 (patch) | |
| tree | 4855962ba19b6dcf16c7c2d43ab7d8b82d9ef682 /.gitattributes | |
| parent | 46178552c4622b29d5a70ca23d945e9036caa437 (diff) | |
| parent | bd1251dfe4d60f09e569731d36a92e94acbe297a (diff) | |
| download | otp-c1d11c28ca748075cae5330102bccd10a56b8686.tar.gz otp-c1d11c28ca748075cae5330102bccd10a56b8686.tar.bz2 otp-c1d11c28ca748075cae5330102bccd10a56b8686.zip | |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
erts/doc/src/notes.xml
erts/vsn.mk
lib/debugger/doc/src/notes.xml
lib/debugger/vsn.mk
otp_versions.table
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions