diff options
| author | Wes Baker <wes@wesbaker.com> | 2012-05-07 22:49:33 +0200 |
|---|---|---|
| committer | Wes Baker <wes@wesbaker.com> | 2012-05-07 22:49:33 +0200 |
| commit | d348135ed2131e5fa41dfa0ea7254d2f6759f3e0 (patch) | |
| tree | 14cfc61c47686b895acd9e49b45c559d311195cc /system/database/drivers/sqlite/sqlite_driver.php | |
| parent | bb2c83bddbf51c42815be3de60eab24fd87ae392 (diff) | |
| parent | d207c9218531afe666168c1f5f59abd1bc19a8aa (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Conflicts:
system/core/Security.php
Diffstat (limited to 'system/database/drivers/sqlite/sqlite_driver.php')
| -rw-r--r-- | system/database/drivers/sqlite/sqlite_driver.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 5021deb63..551704f83 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -29,7 +29,7 @@ * SQLite Database Adapter Class * * Note: _DB is an extender class that the app controller - * creates dynamically based on whether the active record + * creates dynamically based on whether the query builder * class is being used or not. * * @package CodeIgniter @@ -461,4 +461,4 @@ class CI_DB_sqlite_driver extends CI_DB { } /* End of file sqlite_driver.php */ -/* Location: ./system/database/drivers/sqlite/sqlite_driver.php */
\ No newline at end of file +/* Location: ./system/database/drivers/sqlite/sqlite_driver.php */ |