aboutsummaryrefslogtreecommitdiffstats
path: root/lib/docbuilder/Makefile
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2010-07-07 10:46:48 +0200
committerRaimo Niskanen <[email protected]>2010-07-07 10:46:48 +0200
commita1a9aff12c1365dc155328410c5253d7495f757f (patch)
treeb7b12d6f7cd38f94702bbc946d9671b9583d2738 /lib/docbuilder/Makefile
parent0aa94b3b70ae9bd99e23f99e51f08d694403fd21 (diff)
parent2cca6506bafedc5ebb720510151a98602133d8e5 (diff)
downloadotp-a1a9aff12c1365dc155328410c5253d7495f757f.tar.gz
otp-a1a9aff12c1365dc155328410c5253d7495f757f.tar.bz2
otp-a1a9aff12c1365dc155328410c5253d7495f757f.zip
Merge branch 'cf/timer_tc' into dev
* cf/timer_tc: Add timer:tc/2 to measure the elapsed time of anonymous functions Conflicts: lib/stdlib/doc/src/timer.xml
Diffstat (limited to 'lib/docbuilder/Makefile')
0 files changed, 0 insertions, 0 deletions