aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-09-02 10:28:36 +0200
committerBjörn Gustavsson <[email protected]>2011-09-02 10:28:36 +0200
commitce148d0dc69797091a998ed73cf0a3dd6df83ec9 (patch)
tree4ffbd1ec55d8a60fb6a80c0ce52c81bcd5c3622a /erts/doc
parent025e5799c3204fbacb59340e752f9a72f75363bd (diff)
parent9f1e455017228e8f35d82e2fe1e3c5268c2e0aa3 (diff)
downloadotp-ce148d0dc69797091a998ed73cf0a3dd6df83ec9.tar.gz
otp-ce148d0dc69797091a998ed73cf0a3dd6df83ec9.tar.bz2
otp-ce148d0dc69797091a998ed73cf0a3dd6df83ec9.zip
Merge branch 'dev' into major
* dev: Make the check_old_code/1 BIF auto-imported Deprecate the docbuilder application Conflicts: lib/stdlib/src/otp_internal.erl
Diffstat (limited to 'erts/doc')
0 files changed, 0 insertions, 0 deletions