diff options
author | Erlang/OTP <[email protected]> | 2010-05-26 10:27:36 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-05-26 10:27:36 +0000 |
commit | 36a59bf8581a53b2da411db6ab9d92e014787c2a (patch) | |
tree | 5dc7807778ff1b897d0d8fcf0a2661883bf3b98a /lib/stdlib/src/timer.erl | |
parent | 9ac8fb78f4463a3a26b0c40c7f5f5aa90898f605 (diff) | |
parent | 9480662b19d045e6243400c6df6c54728ff9fb19 (diff) | |
download | otp-36a59bf8581a53b2da411db6ab9d92e014787c2a.tar.gz otp-36a59bf8581a53b2da411db6ab9d92e014787c2a.tar.bz2 otp-36a59bf8581a53b2da411db6ab9d92e014787c2a.zip |
Merge branch 'mh/escript-erlang-mode' into dev
* mh/escript-erlang-mode:
Associate files using interpreter "escript" with Erlang mode
Diffstat (limited to 'lib/stdlib/src/timer.erl')
0 files changed, 0 insertions, 0 deletions