diff options
| author | Henrik Nord <[email protected]> | 2015-12-07 15:43:41 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-12-07 15:43:41 +0100 |
| commit | a16b7d63cc665dca90305b146c15de04487808db (patch) | |
| tree | ffdd695517b5f74e5a0123dd2ace905b6d3ddd73 /lib/edoc/priv | |
| parent | 4cde96f8525f0c59f2037a981a4954da0224d224 (diff) | |
| parent | 42493ad886f9b1b3e32e6f1bef084275a4480096 (diff) | |
| download | otp-a16b7d63cc665dca90305b146c15de04487808db.tar.gz otp-a16b7d63cc665dca90305b146c15de04487808db.tar.bz2 otp-a16b7d63cc665dca90305b146c15de04487808db.zip | |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
erts/doc/src/notes.xml
erts/vsn.mk
otp_versions.table
Diffstat (limited to 'lib/edoc/priv')
0 files changed, 0 insertions, 0 deletions