diff options
| author | Hans Bolinder <[email protected]> | 2011-05-13 14:08:25 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2011-05-13 14:08:59 +0200 |
| commit | 0ccc57b1e3772deaf5650077808a38a52b1133b9 (patch) | |
| tree | ed98a14e3cda51c344a04c85db7843b274dfe56a /erts/emulator | |
| parent | 22f3c9720cb7d19a3aafac613f03aede91d6283f (diff) | |
| parent | 229d0d8ca88bc344bed89e46541b325c1d267996 (diff) | |
| download | otp-0ccc57b1e3772deaf5650077808a38a52b1133b9.tar.gz otp-0ccc57b1e3772deaf5650077808a38a52b1133b9.tar.bz2 otp-0ccc57b1e3772deaf5650077808a38a52b1133b9.zip | |
Merge branch 'hb/stdlib/doc_specs/OTP-9271' into dev
* hb/stdlib/doc_specs/OTP-9271:
Use Erlang specs and types for documentation
Conflicts:
lib/stdlib/doc/src/timer.xml
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions