agregacion de Zend Resource View
tipo de cambio: [add]

estado:[add]

descripcion del commit:
{
add de Zend Resource view para agregar el titulo en el application.ini
}
[master] se agrega hooks en la carpeta git
tipo de cambio: [add]

estado:[add]

descripcion del commit:
{
se agrega hooks en la carpeta git/hooks
usenlo con sabiduria
}
[master] cambio de ruta en el proyecto
tipo de cambio: [add]

estado:[add]

descripcion del commit:
{
cambio de rutas en el proyecto
}
[master] files eliminados para el proyecto
tipo de cambio: [add]

estado:[add]

descripcion del commit:
{
files eliminados para el proyecto
}
[master] add cambios de carpetas de hooks de git
tipo de cambio: [add]

estado:[add]

descripcion del commit:
{
add cambios de ruta de git
}
add install.sh generador de codigo para carpetas
tipo de cambio: [add]

estado:[add]

descripcion del commit:
{
add generador de codigo
}
[master] format layout
[master] delete src
[development] add changelog to proyect
[development] add composer.json
[development] format code text
[development] add language Zend_Validate
[development] add library core
[development] add constant APPLICATION_PUBLIC
[development] add files.ini in proyect

se crea los files para los params.ini
routes.ini
[development] add ini resources.ini
[development] add modules to proyect
Merge branch 'master' of /media/slovacus/projects/Repositorios/PHP/Zend/zf-skeleton

Conflicts:
	resource/images/readme
	source/application/configs/readme.txt
	source/build/readme.txt
	source/data/cache/readme.txt
	source/data/db/readme.txt
	source/data/logs/readme.txt
	source/data/readme.txt
	source/library/Dompdf/lib/ttf2ufm/bin/ttf2ufm.exe
	source/library/Zrt/Application/Resource/Api.php
	source/library/Zrt/Application/Resource/Auth.php
	source/library/Zrt/Application/Resource/Log.php
	source/library/Zrt/Application/Resource/Recaptcha.php
	source/library/Zrt/Application/Resource/Session.php
	source/library/Zrt/Application/Resource/View.php
	source/library/Zrt/Auth/Adapter/DbTable/Auth.php
	source/library/Zrt/Controller/Action.php
	source/library/Zrt/Controller/Action/Helper/Auth.php
	source/library/Zrt/Controller/Action/Helper/DirectAccessRestrictor.php
	source/library/Zrt/Controller/Action/Helper/Logger.php
	source/library/Zrt/Controller/Action/Helper/MyFlashMessenger.php
	source/library/Zrt/Controller/Error.php
	source/library/Zrt/Controller/Plugin/Acl.php
	source/library/Zrt/Controller/Plugin/Auth.php
	source/library/Zrt/Controller/Plugin/Caching.php
	source/library/Zrt/Controller/Plugin/ContextDetection.php
	source/library/Zrt/Controller/Plugin/CurrencySelector.php
	source/library/Zrt/Controller/Plugin/DeleteHandler.php
	source/library/Zrt/Controller/Plugin/LangSelector.php
	source/library/Zrt/Controller/Plugin/Layout.php
	source/library/Zrt/Controller/Plugin/MultiTenanting.php
	source/library/Zrt/Controller/Plugin/PrepareNavigation.php
	source/library/Zrt/Controller/Plugin/PutHandler.php
	source/library/Zrt/Controller/Plugin/Routes.php
	source/library/Zrt/Controller/Plugin/Routing.php
	source/library/Zrt/Controller/Plugin/Seo.php
	source/library/Zrt/Controller/Plugin/SetRedirect.php
	source/library/Zrt/Controller/Request/Cli.php
	source/library/Zrt/Controller/Request/Cli/Exception.php
	source/library/Zrt/Controller/Request/CliTestCase.php
	source/library/Zrt/Controller/Router/Cli.php
	source/library/Zrt/Conversion/Abstract.php
	source/library/Zrt/Conversion/Csv.php
	source/library/Zrt/Conversion/Dbf.php
	source/library/Zrt/Conversion/IniReadItem.php
	source/library/Zrt/Conversion/TextFile.php
	source/library/Zrt/JQuery/JqGrid.php
	source/library/Zrt/JQuery/JqGrid/Adapter/Array.php
	source/library/Zrt/JQuery/JqGrid/Adapter/DbSelect.php
	source/library/Zrt/JQuery/JqGrid/Adapter/DbTableSelect.php
	source/library/Zrt/JQuery/JqGrid/Adapter/Doctrine.php
	source/library/Zrt/JQuery/JqGrid/Adapter/Interface.php
	source/library/Zrt/JQuery/JqGrid/Column.php
	source/library/Zrt/JQuery/JqGrid/Column/Decorator/Abstract.php
	source/library/Zrt/JQuery/JqGrid/Column/Decorator/Date.php
	source/library/Zrt/JQuery/JqGrid/Column/Decorator/Link.php
	source/library/Zrt/JQuery/JqGrid/Exception.php
	source/library/Zrt/JQuery/JqGrid/Plugin/Abstract.php
	source/library/Zrt/JQuery/JqGrid/Plugin/Broker.php
	source/library/Zrt/JQuery/JqGrid/Plugin/FooterRow.php
	source/library/Zrt/JQuery/JqGrid/Plugin/Pager.php
	source/library/Zrt/JQuery/JqGrid/Plugin/ToolbarFilter.php
	source/library/Zrt/JQuery/JqGrid/View/Helper/JqGrid.php
	source/library/Zrt/Migration/Delta.php
	source/library/Zrt/Migration/Exception.php
	source/library/Zrt/Migration/Manager.php
	source/library/Zrt/Tools/Ip.php
	source/library/Zrt/Tools/Text.php
	source/nbproject/private/private.properties
	source/nbproject/project.properties
	source/shell/readme.txt
	trunk/source/application/configs/readme.txt
	trunk/source/build/readme.txt
	trunk/source/data/cache/readme.txt
	trunk/source/data/db/readme.txt
	trunk/source/data/logs/readme.txt
	trunk/source/data/readme.txt
	trunk/source/shell/readme.txt
Merge branch 'development'

Conflicts:
	source/library/Zrt/Application/Resource/Api.php
	source/library/Zrt/Application/Resource/Auth.php
	source/library/Zrt/Application/Resource/Log.php
	source/library/Zrt/Controller/Action/Helper/Auth.php