From b251c522205973bfc3992e22d70827eb0c2b1b7a Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Sun, 17 Jan 2010 16:02:01 +0000
Subject: Added Flock to the list of browsers in the user agent class

---
 system/application/config/user_agents.php | 1 +
 user_guide/changelog.html                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/application/config/user_agents.php b/system/application/config/user_agents.php
index a1becd98f..a1c0b14b6 100644
--- a/system/application/config/user_agents.php
+++ b/system/application/config/user_agents.php
@@ -48,6 +48,7 @@ $platforms = array (
 // The order of this array should NOT be changed. Many browsers return
 // multiple browser types so we want to identify the sub-type first.
 $browsers = array(
+					'Flock'				=> 'Flock',
 					'Chrome'			=> 'Chrome',
 					'Opera'				=> 'Opera',
 					'MSIE'				=> 'Internet Explorer',
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index f36b2ceba..b94e747e7 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -72,7 +72,7 @@ SVN Revision: </p>
 			<li>Added a <kbd>parse_string()</kbd> method to the <a href="libraries/parser.html">Parser Class</a>.</li>
 			<li>Added HTTP headers and Config information to the <a href="general/profiling.html">Profiler</a> output.</li>
 			<li>Documented <kbd>append_output()</kbd> in the <a href="libraries/output.html">Output Class</a>.</li>
-			<li>Added Chrome to the list of detectable browsers by <kbd>browser()</kbd> in the <a href="libraries/user_agent.html">User Agent Class</a>.</li>
+			<li>Added Chrome and Flock to the list of detectable browsers by <kbd>browser()</kbd> in the <a href="libraries/user_agent.html">User Agent Class</a>.</li>
 		</ul>
 	</li>
 	<li>Database
-- 
cgit v1.2.3-24-g4f1b