aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/Makefile
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-12-06 11:00:32 +0100
committerIngela Anderton Andin <[email protected]>2016-12-06 11:00:32 +0100
commit7c67fe20af71a08e5217306dfcff822701b45222 (patch)
tree450d8e74ecaa3671689f6e66bb0ab22320fcf472 /erts/doc/Makefile
parentb54621a3ab17b0e2f6375b09c5854fc89c5cf412 (diff)
parent84c07543e260bfaa97f04625eee79a4a18fcaca2 (diff)
downloadotp-7c67fe20af71a08e5217306dfcff822701b45222.tar.gz
otp-7c67fe20af71a08e5217306dfcff822701b45222.tar.bz2
otp-7c67fe20af71a08e5217306dfcff822701b45222.zip
Merge branch 'megaco/version' into maint
* megaco/version: Revert "[megaco] Update version" - only test suite updated
Diffstat (limited to 'erts/doc/Makefile')
0 files changed, 0 insertions, 0 deletions