diff options
author | Fredrik Gustafsson <[email protected]> | 2012-08-13 17:36:42 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2012-08-13 17:36:42 +0200 |
commit | 0c9d90f314f364e5b1301ec89d762baabc57c7aa (patch) | |
tree | 6045bf3d75fb2cf0a85017eb08c916b78a807ee5 /erts/emulator/Makefile | |
parent | 10284487779ec3bf3656926d6692c6a9f38be81c (diff) | |
parent | 6c6e745b6939cf0a9907a32495e58aab7bbb4b2d (diff) | |
download | otp-0c9d90f314f364e5b1301ec89d762baabc57c7aa.tar.gz otp-0c9d90f314f364e5b1301ec89d762baabc57c7aa.tar.bz2 otp-0c9d90f314f364e5b1301ec89d762baabc57c7aa.zip |
Merge branch 'mh/doc-now-vs-timestamp/OTP-10180' into maint
* mh/doc-now-vs-timestamp/OTP-10180:
Doc fix: link from erlang:now/0 to os:timestamp/0
Diffstat (limited to 'erts/emulator/Makefile')
0 files changed, 0 insertions, 0 deletions