diff options
| author | Hans Bolinder <[email protected]> | 2015-12-07 10:10:20 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2015-12-07 10:10:20 +0100 |
| commit | 6436c0d210b46b949f5e2de7ad328d3081eb3fa4 (patch) | |
| tree | f505e62aac5bdc06455c5562c6336ec9b0e37540 /erts/emulator/test/system_profile_SUITE_data/Makefile.src | |
| parent | 4dd436b2d887517d50386372946a495aed698663 (diff) | |
| parent | 572bea9807504670b1eec4aab6b8ac833cd42b26 (diff) | |
| download | otp-6436c0d210b46b949f5e2de7ad328d3081eb3fa4.tar.gz otp-6436c0d210b46b949f5e2de7ad328d3081eb3fa4.tar.bz2 otp-6436c0d210b46b949f5e2de7ad328d3081eb3fa4.zip | |
Merge branch 'maint'
* maint:
doc: Fix some minor issues in Types and Function Specifications
erts: Remove CDATA from The Abstract Format document
erts: Correct the types section in The Abstract Format document
stdlib: Correct pretty-printing of map types
stdlib: Pretty-print constraints as 'V :: T'
Conflicts:
erts/doc/src/absform.xml
Diffstat (limited to 'erts/emulator/test/system_profile_SUITE_data/Makefile.src')
0 files changed, 0 insertions, 0 deletions