diff options
| author | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-24 19:30:36 +0200 |
|---|---|---|
| committer | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-24 19:30:36 +0200 |
| commit | b51823dde5fbae508b8ebf99258d2f514a8bece8 (patch) | |
| tree | 4db09a22f85e0ddf151c940cd3e6fbaa799b8513 /application/config/user_agents.php | |
| parent | a53f402b78ad07fb0f6da19cff0c7bec3a09a4c0 (diff) | |
| parent | a7001e968a4791312391eb245ad84888893cda8f (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Conflicts:
user_guide_src/source/changelog.rst
Diffstat (limited to 'application/config/user_agents.php')
| -rw-r--r-- | application/config/user_agents.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 416ef5679..78e4c8c7d 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -36,6 +36,7 @@ */ $platforms = array( + 'windows nt 6.2' => 'Windows 8', 'windows nt 6.1' => 'Windows 7', 'windows nt 6.0' => 'Windows Vista', 'windows nt 5.2' => 'Windows 2003', @@ -146,6 +147,7 @@ $mobiles = array( 'ipaq' => 'HP iPaq', 'mot-' => 'Motorola', 'playstation portable' => 'PlayStation Portable', + 'playstation 3' => 'PlayStation 3', 'hiptop' => 'Danger Hiptop', 'nec-' => 'NEC', 'panasonic' => 'Panasonic', @@ -155,10 +157,10 @@ $mobiles = array( 'spv' => 'SPV', 'zte' => 'ZTE', 'sendo' => 'Sendo', - 'dsi' => 'Nintendo DSi', - 'ds' => 'Nintendo DS', + 'nintendo dsi' => 'Nintendo DSi', + 'nintendo ds' => 'Nintendo DS', + 'nintendo 3ds' => 'Nintendo 3DS', 'wii' => 'Nintendo Wii', - '3ds' => 'Nintendo 3DS', 'open web' => 'Open Web', 'openweb' => 'OpenWeb', |