Inicio
Commit
	modified:   .gitattributes
	modified:   .gitignore
	modified:   CodeIgniter/application/views/welcome_message.php
	modified:   CodeIgniter/application/views/welcome_message.php~
Prueba quinimil xD
Merge branch 'master' of github.com:alexrember/RM

Conflicts:
	.gitattributes
	.gitignore
	CodeIgniter/application/.htaccess
	CodeIgniter/application/cache/.htaccess
	CodeIgniter/application/cache/index.html
	CodeIgniter/application/config/autoload.php
	CodeIgniter/application/config/config.php
	CodeIgniter/application/config/constants.php
	CodeIgniter/application/config/database.php
	CodeIgniter/application/config/doctypes.php
	CodeIgniter/application/config/foreign_chars.php
	CodeIgniter/application/config/hooks.php
	CodeIgniter/application/config/index.html
	CodeIgniter/application/config/migration.php
	CodeIgniter/application/config/mimes.php
	CodeIgniter/application/config/profiler.php
	CodeIgniter/application/config/routes.php
	CodeIgniter/application/config/smileys.php
	CodeIgniter/application/config/user_agents.php
	CodeIgniter/application/controllers/index.html
	CodeIgniter/application/controllers/welcome.php
	CodeIgniter/application/core/index.html
	CodeIgniter/application/errors/error_404.php
	CodeIgniter/application/errors/error_db.php
	CodeIgniter/application/errors/error_general.php
	CodeIgniter/application/errors/error_php.php
	CodeIgniter/application/errors/index.html
	CodeIgniter/application/helpers/index.html
	CodeIgniter/application/hooks/index.html
	CodeIgniter/application/index.html
	CodeIgniter/application/language/english/index.html
	CodeIgniter/application/libraries/index.html
	CodeIgniter/application/logs/index.html
	CodeIgniter/application/models/index.html
	CodeIgniter/application/third_party/index.html
	CodeIgniter/application/views/index.html
	CodeIgniter/application/views/welcome_message.php
	CodeIgniter/index.php
	CodeIgniter/license.txt
	CodeIgniter/system/.htaccess
	CodeIgniter/system/core/Benchmark.php
	CodeIgniter/system/core/CodeIgniter.php
	CodeIgniter/system/core/Common.php
	CodeIgniter/system/core/Config.php
	CodeIgniter/system/core/Controller.php
	CodeIgniter/system/core/Exceptions.php
	CodeIgniter/system/core/Hooks.php
	CodeIgniter/system/core/Input.php
	CodeIgniter/system/core/Lang.php
	CodeIgniter/system/core/Loader.php
	CodeIgniter/system/core/Model.php
	CodeIgniter/system/core/Output.php
	CodeIgniter/system/core/Router.php
	CodeIgniter/system/core/Security.php
	CodeIgniter/system/core/URI.php
	CodeIgniter/system/core/Utf8.php
	CodeIgniter/system/core/index.html
	CodeIgniter/system/database/DB.php
	CodeIgniter/system/database/DB_active_rec.php
	CodeIgniter/system/database/DB_cache.php
	CodeIgniter/system/database/DB_driver.php
	CodeIgniter/system/database/DB_forge.php
	CodeIgniter/system/database/DB_result.php
	CodeIgniter/system/database/DB_utility.php
	CodeIgniter/system/database/drivers/cubrid/cubrid_driver.php
	CodeIgniter/system/database/drivers/cubrid/cubrid_forge.php
	CodeIgniter/system/database/drivers/cubrid/cubrid_result.php
	CodeIgniter/system/database/drivers/cubrid/cubrid_utility.php
	CodeIgniter/system/database/drivers/cubrid/index.html
	CodeIgniter/system/database/drivers/index.html
	CodeIgniter/system/database/drivers/mssql/index.html
	CodeIgniter/system/database/drivers/mssql/mssql_driver.php
	CodeIgniter/system/database/drivers/mssql/mssql_forge.php
	CodeIgniter/system/database/drivers/mssql/mssql_result.php
	CodeIgniter/system/database/drivers/mssql/mssql_utility.php
	CodeIgniter/system/database/drivers/mysql/index.html
	CodeIgniter/system/database/drivers/mysql/mysql_driver.php
	CodeIgniter/system/database/drivers/mysql/mysql_forge.php
	CodeIgniter/system/database/drivers/mysql/mysql_result.php
	CodeIgniter/system/database/drivers/mysql/mysql_utility.php
	CodeIgniter/system/database/drivers/mysqli/index.html
	CodeIgniter/system/database/drivers/mysqli/mysqli_driver.php
	CodeIgniter/system/database/drivers/mysqli/mysqli_forge.php
	CodeIgniter/system/database/drivers/mysqli/mysqli_result.php
	CodeIgniter/system/database/drivers/mysqli/mysqli_utility.php
	CodeIgniter/system/database/drivers/oci8/index.html
	CodeIgniter/system/database/drivers/oci8/oci8_driver.php
	CodeIgniter/system/database/drivers/oci8/oci8_forge.php
	CodeIgniter/system/database/drivers/oci8/oci8_result.php
	CodeIgniter/system/database/drivers/oci8/oci8_utility.php
	CodeIgniter/system/database/drivers/odbc/index.html
	CodeIgniter/system/database/drivers/odbc/odbc_driver.php
	CodeIgniter/system/database/drivers/odbc/odbc_forge.php
	CodeIgniter/system/database/drivers/odbc/odbc_result.php
	CodeIgniter/system/database/drivers/odbc/odbc_utility.php
	CodeIgniter/system/database/drivers/pdo/index.html
	CodeIgniter/system/database/drivers/pdo/pdo_driver.php
	CodeIgniter/system/database/drivers/pdo/pdo_forge.php
	CodeIgniter/system/database/drivers/pdo/pdo_result.php
	CodeIgniter/system/database/drivers/pdo/pdo_utility.php
	CodeIgniter/system/database/drivers/postgre/index.html
	CodeIgniter/system/database/drivers/postgre/postgre_driver.php
	CodeIgniter/system/database/drivers/postgre/postgre_forge.php
	CodeIgniter/system/database/drivers/postgre/postgre_result.php
	CodeIgniter/system/database/drivers/postgre/postgre_utility.php
	CodeIgniter/system/database/drivers/sqlite/index.html
	CodeIgniter/system/database/drivers/sqlite/sqlite_driver.php
	CodeIgniter/system/database/drivers/sqlite/sqlite_forge.php
	CodeIgniter/system/database/drivers/sqlite/sqlite_result.php
	CodeIgniter/system/database/drivers/sqlite/sqlite_utility.php
	CodeIgniter/system/database/drivers/sqlsrv/index.html
	CodeIgniter/system/database/drivers/sqlsrv/sqlsrv_driver.php
	CodeIgniter/system/database/drivers/sqlsrv/sqlsrv_forge.php
	CodeIgniter/system/database/drivers/sqlsrv/sqlsrv_result.php
	CodeIgniter/system/database/drivers/sqlsrv/sqlsrv_utility.php
	CodeIgniter/system/database/index.html
	CodeIgniter/system/fonts/index.html
	CodeIgniter/system/fonts/texb.ttf
	CodeIgniter/system/helpers/array_helper.php
	CodeIgniter/system/helpers/captcha_helper.php
	CodeIgniter/system/helpers/cookie_helper.php
	CodeIgniter/system/helpers/date_helper.php
	CodeIgniter/system/helpers/directory_helper.php
	CodeIgniter/system/helpers/download_helper.php
	CodeIgniter/system/helpers/email_helper.php
	CodeIgniter/system/helpers/file_helper.php
	CodeIgniter/system/helpers/form_helper.php
	CodeIgniter/system/helpers/html_helper.php
	CodeIgniter/system/helpers/index.html
	CodeIgniter/system/helpers/inflector_helper.php
	CodeIgniter/system/helpers/language_helper.php
	CodeIgniter/system/helpers/number_helper.php
	CodeIgniter/system/helpers/path_helper.php
	CodeIgniter/system/helpers/security_helper.php
	CodeIgniter/system/helpers/smiley_helper.php
	CodeIgniter/system/helpers/string_helper.php
	CodeIgniter/system/helpers/text_helper.php
	CodeIgniter/system/helpers/typography_helper.php
	CodeIgniter/system/helpers/url_helper.php
	CodeIgniter/system/helpers/xml_helper.php
	CodeIgniter/system/index.html
	CodeIgniter/system/language/english/calendar_lang.php
	CodeIgniter/system/language/english/date_lang.php
	CodeIgniter/system/language/english/db_lang.php
	CodeIgniter/system/language/english/email_lang.php
	CodeIgniter/system/language/english/form_validation_lang.php
	CodeIgniter/system/language/english/ftp_lang.php
	CodeIgniter/system/language/english/imglib_lang.php
	CodeIgniter/system/language/english/index.html
	CodeIgniter/system/language/english/migration_lang.php
	CodeIgniter/system/language/english/number_lang.php
	CodeIgniter/system/language/english/profiler_lang.php
	CodeIgniter/system/language/english/unit_test_lang.php
	CodeIgniter/system/language/english/upload_lang.php
	CodeIgniter/system/language/index.html
	CodeIgniter/system/libraries/Cache/Cache.php
	CodeIgniter/system/libraries/Cache/drivers/Cache_apc.php
	CodeIgniter/system/libraries/Cache/drivers/Cache_dummy.php
	CodeIgniter/system/libraries/Cache/drivers/Cache_file.php
	CodeIgniter/system/libraries/Cache/drivers/Cache_memcached.php
	CodeIgniter/system/libraries/Calendar.php
	CodeIgniter/system/libraries/Cart.php
	CodeIgniter/system/libraries/Driver.php
	CodeIgniter/system/libraries/Email.php
	CodeIgniter/system/libraries/Encrypt.php
	CodeIgniter/system/libraries/Form_validation.php
	CodeIgniter/system/libraries/Ftp.php
	CodeIgniter/system/libraries/Image_lib.php
	CodeIgniter/system/libraries/Javascript.php
	CodeIgniter/system/libraries/Log.php
	CodeIgniter/system/libraries/Migration.php
	CodeIgniter/system/libraries/Pagination.php
	CodeIgniter/system/libraries/Parser.php
	CodeIgniter/system/libraries/Profiler.php
	CodeIgniter/system/libraries/Session.php
	CodeIgniter/system/libraries/Sha1.php
	CodeIgniter/system/libraries/Table.php
	CodeIgniter/system/libraries/Trackback.php
	CodeIgniter/system/libraries/Typography.php
	CodeIgniter/system/libraries/Unit_test.php
	CodeIgniter/system/libraries/Upload.php
	CodeIgniter/system/libraries/User_agent.php
	CodeIgniter/system/libraries/Xmlrpc.php
	CodeIgniter/system/libraries/Xmlrpcs.php
	CodeIgniter/system/libraries/Zip.php
	CodeIgniter/system/libraries/index.html
	CodeIgniter/system/libraries/javascript/Jquery.php
	CodeIgniter/user_guide/changelog.html
	CodeIgniter/user_guide/database/active_record.html
	CodeIgniter/user_guide/database/caching.html
	CodeIgniter/user_guide/database/call_function.html
	CodeIgniter/user_guide/database/configuration.html
	CodeIgniter/user_guide/database/connecting.html
	CodeIgniter/user_guide/database/examples.html
	CodeIgniter/user_guide/database/fields.html
	CodeIgniter/user_guide/database/forge.html
	CodeIgniter/user_guide/database/helpers.html
	CodeIgniter/user_guide/database/index.html
	CodeIgniter/user_guide/database/queries.html
	CodeIgniter/user_guide/database/results.html
	CodeIgniter/user_guide/database/table_data.html
	CodeIgniter/user_guide/database/transactions.html
	CodeIgniter/user_guide/database/utilities.html
	CodeIgniter/user_guide/doc_style/index.html
	CodeIgniter/user_guide/doc_style/template.html
	CodeIgniter/user_guide/general/alternative_php.html
	CodeIgniter/user_guide/general/ancillary_classes.html
	CodeIgniter/user_guide/general/autoloader.html
	CodeIgniter/user_guide/general/caching.html
	CodeIgniter/user_guide/general/cli.html
	CodeIgniter/user_guide/general/common_functions.html
	CodeIgniter/user_guide/general/controllers.html
	CodeIgniter/user_guide/general/core_classes.html
	CodeIgniter/user_guide/general/creating_drivers.html
	CodeIgniter/user_guide/general/creating_libraries.html
	CodeIgniter/user_guide/general/credits.html
	CodeIgniter/user_guide/general/drivers.html
	CodeIgniter/user_guide/general/environments.html
	CodeIgniter/user_guide/general/errors.html
	CodeIgniter/user_guide/general/helpers.html
	CodeIgniter/user_guide/general/hooks.html
	CodeIgniter/user_guide/general/libraries.html
	CodeIgniter/user_guide/general/managing_apps.html
	CodeIgniter/user_guide/general/models.html
	CodeIgniter/user_guide/general/profiling.html
	CodeIgniter/user_guide/general/quick_reference.html
	CodeIgniter/user_guide/general/requirements.html
	CodeIgniter/user_guide/general/reserved_names.html
	CodeIgniter/user_guide/general/routing.html
	CodeIgniter/user_guide/general/security.html
	CodeIgniter/user_guide/general/styleguide.html
	CodeIgniter/user_guide/general/urls.html
	CodeIgniter/user_guide/general/views.html
	CodeIgniter/user_guide/helpers/array_helper.html
	CodeIgniter/user_guide/helpers/captcha_helper.html
	CodeIgniter/user_guide/helpers/cookie_helper.html
	CodeIgniter/user_guide/helpers/date_helper.html
	CodeIgniter/user_guide/helpers/directory_helper.html
	CodeIgniter/user_guide/helpers/download_helper.html
	CodeIgniter/user_guide/helpers/email_helper.html
	CodeIgniter/user_guide/helpers/file_helper.html
	CodeIgniter/user_guide/helpers/form_helper.html
	CodeIgniter/user_guide/helpers/html_helper.html
	CodeIgniter/user_guide/helpers/inflector_helper.html
	CodeIgniter/user_guide/helpers/language_helper.html
	CodeIgniter/user_guide/helpers/number_helper.html
	CodeIgniter/user_guide/helpers/path_helper.html
	CodeIgniter/user_guide/helpers/security_helper.html
	CodeIgniter/user_guide/helpers/smiley_helper.html
	CodeIgniter/user_guide/helpers/string_helper.html
	CodeIgniter/user_guide/helpers/text_helper.html
	CodeIgniter/user_guide/helpers/typography_helper.html
	CodeIgniter/user_guide/helpers/url_helper.html
	CodeIgniter/user_guide/helpers/xml_helper.html
	CodeIgniter/user_guide/images/appflowchart.gif
	CodeIgniter/user_guide/images/arrow.gif
	CodeIgniter/user_guide/images/ci_logo.jpg
	CodeIgniter/user_guide/images/ci_logo_flame.jpg
	CodeIgniter/user_guide/images/ci_quick_ref.png
	CodeIgniter/user_guide/images/codeigniter_1.7.1_helper_reference.pdf
	CodeIgniter/user_guide/images/codeigniter_1.7.1_helper_reference.png
	CodeIgniter/user_guide/images/codeigniter_1.7.1_library_reference.pdf
	CodeIgniter/user_guide/images/codeigniter_1.7.1_library_reference.png
	CodeIgniter/user_guide/images/file.gif
	CodeIgniter/user_guide/images/folder.gif
	CodeIgniter/user_guide/images/nav_bg_darker.jpg
	CodeIgniter/user_guide/images/nav_separator_darker.jpg
	CodeIgniter/user_guide/images/nav_toggle_darker.jpg
	CodeIgniter/user_guide/images/reactor-bullet.png
	CodeIgniter/user_guide/images/smile.gif
	CodeIgniter/user_guide/images/transparent.gif
	CodeIgniter/user_guide/index.html
	CodeIgniter/user_guide/installation/downloads.html
	CodeIgniter/user_guide/installation/index.html
	CodeIgniter/user_guide/installation/troubleshooting.html
	CodeIgniter/user_guide/installation/upgrade_120.html
	CodeIgniter/user_guide/installation/upgrade_130.html
	CodeIgniter/user_guide/installation/upgrade_131.html
	CodeIgniter/user_guide/installation/upgrade_132.html
	CodeIgniter/user_guide/installation/upgrade_133.html
	CodeIgniter/user_guide/installation/upgrade_140.html
	CodeIgniter/user_guide/installation/upgrade_141.html
	CodeIgniter/user_guide/installation/upgrade_150.html
	CodeIgniter/user_guide/installation/upgrade_152.html
	CodeIgniter/user_guide/installation/upgrade_153.html
	CodeIgniter/user_guide/installation/upgrade_154.html
	CodeIgniter/user_guide/installation/upgrade_160.html
	CodeIgniter/user_guide/installation/upgrade_161.html
	CodeIgniter/user_guide/installation/upgrade_162.html
	CodeIgniter/user_guide/installation/upgrade_163.html
	CodeIgniter/user_guide/installation/upgrade_170.html
	CodeIgniter/user_guide/installation/upgrade_171.html
	CodeIgniter/user_guide/installation/upgrade_172.html
	CodeIgniter/user_guide/installation/upgrade_200.html
	CodeIgniter/user_guide/installation/upgrade_201.html
	CodeIgniter/user_guide/installation/upgrade_202.html
	CodeIgniter/user_guide/installation/upgrade_203.html
	CodeIgniter/user_guide/installation/upgrade_210.html
	CodeIgniter/user_guide/installation/upgrade_211.html
	CodeIgniter/user_guide/installation/upgrade_212.html
	CodeIgniter/user_guide/installation/upgrade_213.html
	CodeIgniter/user_guide/installation/upgrade_b11.html
	CodeIgniter/user_guide/installation/upgrading.html
	CodeIgniter/user_guide/libraries/benchmark.html
	CodeIgniter/user_guide/libraries/caching.html
	CodeIgniter/user_guide/libraries/calendar.html
	CodeIgniter/user_guide/libraries/cart.html
	CodeIgniter/user_guide/libraries/config.html
	CodeIgniter/user_guide/libraries/email.html
	CodeIgniter/user_guide/libraries/encryption.html
	CodeIgniter/user_guide/libraries/file_uploading.html
	CodeIgniter/user_guide/libraries/form_validation.html
	CodeIgniter/user_guide/libraries/ftp.html
	CodeIgniter/user_guide/libraries/image_lib.html
	CodeIgniter/user_guide/libraries/input.html
	CodeIgniter/user_guide/libraries/javascript.html
	CodeIgniter/user_guide/libraries/language.html
	CodeIgniter/user_guide/libraries/loader.html
	CodeIgniter/user_guide/libraries/migration.html
	CodeIgniter/user_guide/libraries/output.html
	CodeIgniter/user_guide/libraries/pagination.html
	CodeIgniter/user_guide/libraries/parser.html
	CodeIgniter/user_guide/libraries/security.html
	CodeIgniter/user_guide/libraries/sessions.html
	CodeIgniter/user_guide/libraries/table.html
	CodeIgniter/user_guide/libraries/trackback.html
	CodeIgniter/user_guide/libraries/typography.html
	CodeIgniter/user_guide/libraries/unit_testing.html
	CodeIgniter/user_guide/libraries/uri.html
	CodeIgniter/user_guide/libraries/user_agent.html
	CodeIgniter/user_guide/libraries/xmlrpc.html
	CodeIgniter/user_guide/libraries/zip.html
	CodeIgniter/user_guide/license.html
	CodeIgniter/user_guide/nav/hacks.txt
	CodeIgniter/user_guide/nav/moo.fx.js
	CodeIgniter/user_guide/nav/nav.js
	CodeIgniter/user_guide/nav/prototype.lite.js
	CodeIgniter/user_guide/nav/user_guide_menu.js
	CodeIgniter/user_guide/overview/appflow.html
	CodeIgniter/user_guide/overview/at_a_glance.html
	CodeIgniter/user_guide/overview/cheatsheets.html
	CodeIgniter/user_guide/overview/features.html
	CodeIgniter/user_guide/overview/getting_started.html
	CodeIgniter/user_guide/overview/goals.html
	CodeIgniter/user_guide/overview/index.html
	CodeIgniter/user_guide/overview/mvc.html
	CodeIgniter/user_guide/toc.html
	CodeIgniter/user_guide/tutorial/conclusion.html
	CodeIgniter/user_guide/tutorial/create_news_items.html
	CodeIgniter/user_guide/tutorial/hard_coded_pages.html
	CodeIgniter/user_guide/tutorial/index.html
	CodeIgniter/user_guide/tutorial/news_section.html
	CodeIgniter/user_guide/tutorial/static_pages.html
	CodeIgniter/user_guide/userguide.css
Vidrios Toreto
Merge branch 'master' of git://github.com/alexrember/CRM
prueba quinimil2
probando