diff options
author | Anders Svensson <[email protected]> | 2013-02-23 11:01:46 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2013-02-23 11:01:46 +0100 |
commit | df465d70c5e7833a393fea02eabf477bbe6c542b (patch) | |
tree | 902bb838db4c047d6b026373c9b7085530bcab89 /erts/doc/src/erl.xml | |
parent | e23e5d906dcb5168697270a50ea765e480248faf (diff) | |
parent | acb318e1d702d6ea9ca79257abd09473c091fc9f (diff) | |
download | otp-df465d70c5e7833a393fea02eabf477bbe6c542b.tar.gz otp-df465d70c5e7833a393fea02eabf477bbe6c542b.tar.bz2 otp-df465d70c5e7833a393fea02eabf477bbe6c542b.zip |
Merge branch 'anders/diameter/SoC/OTP-10688'
* anders/diameter/SoC/OTP-10688:
Add RFC 6733 commentary to SoC chapter
Add RFC 6737 Capabilities Update dictionary
Remove cruft from doc Makefile
Diffstat (limited to 'erts/doc/src/erl.xml')
0 files changed, 0 insertions, 0 deletions