diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-20 20:58:37 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-20 20:58:37 +0200 |
| commit | 394d8c5bd3e04bd7992793ca7c648f4306a9539d (patch) | |
| tree | d061b4339f2c3f30428256efae741ab04fd2bf6e /system/core/Benchmark.php | |
| parent | 43194ea1af658914a89ca49aed4dca4617b9c4ff (diff) | |
| parent | d56be70257696d0bbf2dcc880888d8dc17cba21c (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Benchmark.php')
| -rwxr-xr-x[-rw-r--r--] | system/core/Benchmark.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php index 515550e9f..a200727ab 100644..100755 --- a/system/core/Benchmark.php +++ b/system/core/Benchmark.php @@ -29,6 +29,11 @@ */ class CI_Benchmark { + /** + * List of all benchmark markers and when they were added + * + * @var array + */ var $marker = array(); // -------------------------------------------------------------------- |