aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/internal_doc
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-02-02 15:27:02 +0100
committerBjörn Gustavsson <[email protected]>2012-02-02 15:27:02 +0100
commit94da0412ba37e62567e3e377c1c6063c379c0fe1 (patch)
tree58f49deaf3c65cdefeffe88a00443cf3b64753ca /erts/emulator/internal_doc
parent61fa5c03369e9ae6de2b4ae24438c236df93d7cb (diff)
parent8929e4d94620c109d31387e6fadfa83b71121a6a (diff)
downloadotp-94da0412ba37e62567e3e377c1c6063c379c0fe1.tar.gz
otp-94da0412ba37e62567e3e377c1c6063c379c0fe1.tar.bz2
otp-94da0412ba37e62567e3e377c1c6063c379c0fe1.zip
Merge branch 'maint-r14' into maint-r15
* maint-r14: Prepare release [snmp/agent] Add proper release notes [snmp/agent] Wrong OID used for error message reply [snmp/agent] Added backup check for local_db [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere Conflicts: erts/doc/src/notes.xml erts/vsn.mk
Diffstat (limited to 'erts/emulator/internal_doc')
0 files changed, 0 insertions, 0 deletions