From 4b9c62980599228f070b401c7673dce8085b0c61 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:40:48 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 system/core/Benchmark.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/core/Benchmark.php')

diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php
index 3686c2d73..515550e9f 100644
--- a/system/core/Benchmark.php
+++ b/system/core/Benchmark.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -19,7 +19,7 @@
  * CodeIgniter Benchmark Class
  *
  * This class enables you to mark points and calculate the time difference
- * between them. Memory consumption can also be displayed.
+ * between them.  Memory consumption can also be displayed.
  *
  * @package		CodeIgniter
  * @subpackage	Libraries
-- 
cgit v1.2.3-24-g4f1b


From 83e7a8ed2536aca790a83e8c533dcdc150e6a79b Mon Sep 17 00:00:00 2001
From: root <root@lamp.local>
Date: Sun, 14 Aug 2011 19:55:57 +0200
Subject: Added some docs to CI core files

---
 system/core/Benchmark.php | 5 +++++
 1 file changed, 5 insertions(+)
 mode change 100644 => 100755 system/core/Benchmark.php

(limited to 'system/core/Benchmark.php')

diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php
old mode 100644
new mode 100755
index 515550e9f..a200727ab
--- 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();
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b