b8c038a3e7742f32915d7f1ab69627075e8d0c39 - code-igniter-v3-giggi

commit	b8c038a3e7742f32915d7f1ab69627075e8d0c39	[log] [tgz]
author	Derek Jones <derek.jones@ellislab.com>	Sat Aug 20 08:57:14 2011 -0500
committer	Derek Jones <derek.jones@ellislab.com>	Sat Aug 20 08:57:14 2011 -0500
tree	809872634daf234591fabacbca8df2203d35b509
parent	4c76272593d82f45761c24917e69b42983f26171 [diff]

updated version number in user guide, removed some stray merge markers found in the change log

user_guide/changelog.html[diff]
user_guide/database/active_record.html[diff]
user_guide/database/caching.html[diff]
user_guide/database/call_function.html[diff]
user_guide/database/configuration.html[diff]
user_guide/database/connecting.html[diff]
user_guide/database/examples.html[diff]
user_guide/database/fields.html[diff]
user_guide/database/forge.html[diff]
user_guide/database/helpers.html[diff]
user_guide/database/index.html[diff]
user_guide/database/queries.html[diff]
user_guide/database/results.html[diff]
user_guide/database/table_data.html[diff]
user_guide/database/transactions.html[diff]
user_guide/database/utilities.html[diff]
user_guide/doc_style/index.html[diff]
user_guide/general/alternative_php.html[diff]
user_guide/general/ancillary_classes.html[diff]
user_guide/general/autoloader.html[diff]
user_guide/general/caching.html[diff]
user_guide/general/cli.html[diff]
user_guide/general/common_functions.html[diff]
user_guide/general/controllers.html[diff]
user_guide/general/core_classes.html[diff]
user_guide/general/creating_drivers.html[diff]
user_guide/general/creating_libraries.html[diff]
user_guide/general/credits.html[diff]
user_guide/general/drivers.html[diff]
user_guide/general/environments.html[diff]
user_guide/general/errors.html[diff]
user_guide/general/helpers.html[diff]
user_guide/general/hooks.html[diff]
user_guide/general/libraries.html[diff]
user_guide/general/managing_apps.html[diff]
user_guide/general/models.html[diff]
user_guide/general/profiling.html[diff]
user_guide/general/quick_reference.html[diff]
user_guide/general/requirements.html[diff]
user_guide/general/reserved_names.html[diff]
user_guide/general/routing.html[diff]
user_guide/general/security.html[diff]
user_guide/general/styleguide.html[diff]
user_guide/general/urls.html[diff]
user_guide/general/views.html[diff]
user_guide/helpers/array_helper.html[diff]
user_guide/helpers/captcha_helper.html[diff]
user_guide/helpers/cookie_helper.html[diff]
user_guide/helpers/date_helper.html[diff]
user_guide/helpers/directory_helper.html[diff]
user_guide/helpers/download_helper.html[diff]
user_guide/helpers/email_helper.html[diff]
user_guide/helpers/file_helper.html[diff]
user_guide/helpers/form_helper.html[diff]
user_guide/helpers/html_helper.html[diff]
user_guide/helpers/inflector_helper.html[diff]
user_guide/helpers/language_helper.html[diff]
user_guide/helpers/number_helper.html[diff]
user_guide/helpers/path_helper.html[diff]
user_guide/helpers/security_helper.html[diff]
user_guide/helpers/smiley_helper.html[diff]
user_guide/helpers/string_helper.html[diff]
user_guide/helpers/text_helper.html[diff]
user_guide/helpers/typography_helper.html[diff]
user_guide/helpers/xml_helper.html[diff]
user_guide/index.html[diff]
user_guide/installation/downloads.html[diff]
user_guide/installation/index.html[diff]
user_guide/installation/troubleshooting.html[diff]
user_guide/installation/upgrade_120.html[diff]
user_guide/installation/upgrade_130.html[diff]
user_guide/installation/upgrade_131.html[diff]
user_guide/installation/upgrade_132.html[diff]
user_guide/installation/upgrade_133.html[diff]
user_guide/installation/upgrade_140.html[diff]
user_guide/installation/upgrade_141.html[diff]
user_guide/installation/upgrade_150.html[diff]
user_guide/installation/upgrade_152.html[diff]
user_guide/installation/upgrade_153.html[diff]
user_guide/installation/upgrade_154.html[diff]
user_guide/installation/upgrade_160.html[diff]
user_guide/installation/upgrade_161.html[diff]
user_guide/installation/upgrade_162.html[diff]
user_guide/installation/upgrade_163.html[diff]
user_guide/installation/upgrade_170.html[diff]
user_guide/installation/upgrade_171.html[diff]
user_guide/installation/upgrade_172.html[diff]
user_guide/installation/upgrade_200.html[diff]
user_guide/installation/upgrade_201.html[diff]
user_guide/installation/upgrade_202.html[diff]
user_guide/installation/upgrade_b11.html[diff]
user_guide/installation/upgrading.html[diff]
user_guide/libraries/benchmark.html[diff]
user_guide/libraries/caching.html[diff]
user_guide/libraries/calendar.html[diff]
user_guide/libraries/cart.html[diff]
user_guide/libraries/config.html[diff]
user_guide/libraries/email.html[diff]
user_guide/libraries/encryption.html[diff]
user_guide/libraries/file_uploading.html[diff]
user_guide/libraries/form_validation.html[diff]
user_guide/libraries/ftp.html[diff]
user_guide/libraries/image_lib.html[diff]
user_guide/libraries/input.html[diff]
user_guide/libraries/javascript.html[diff]
user_guide/libraries/language.html[diff]
user_guide/libraries/loader.html[diff]
user_guide/libraries/output.html[diff]
user_guide/libraries/pagination.html[diff]
user_guide/libraries/parser.html[diff]
user_guide/libraries/security.html[diff]
user_guide/libraries/sessions.html[diff]
user_guide/libraries/table.html[diff]
user_guide/libraries/trackback.html[diff]
user_guide/libraries/typography.html[diff]
user_guide/libraries/unit_testing.html[diff]
user_guide/libraries/uri.html[diff]
user_guide/libraries/user_agent.html[diff]
user_guide/libraries/xmlrpc.html[diff]
user_guide/libraries/zip.html[diff]
user_guide/license.html[diff]
user_guide/overview/appflow.html[diff]
user_guide/overview/at_a_glance.html[diff]
user_guide/overview/cheatsheets.html[diff]
user_guide/overview/features.html[diff]
user_guide/overview/getting_started.html[diff]
user_guide/overview/goals.html[diff]
user_guide/overview/index.html[diff]
user_guide/overview/mvc.html[diff]
user_guide/toc.html[diff]

130 files changed

tree: 809872634daf234591fabacbca8df2203d35b509

.gitignore
application/
index.php
license.txt
system/
user_guide/