merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-06 09:17:52 +02:00
commit dcd4555242

View file

@ -600,8 +600,8 @@ your results will "less often" show up as negative in profile statistics.
.. _profile-timers: .. _profile-timers:
Using a customer timer Using a custom timer
====================== ====================
If you want to change how current time is determined (for example, to force use If you want to change how current time is determined (for example, to force use
of wall-clock time or elapsed process time), pass the timing function you want of wall-clock time or elapsed process time), pass the timing function you want