git.inspyration.org Git - odoo/odoo.git/commit

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2331abe d7c1fcb)

author	rpa (Open ERP) <rpa@tinyerp.com>
	Thu, 13 May 2010 13:26:30 +0000 (18:56 +0530)
committer	rpa (Open ERP) <rpa@tinyerp.com>
	Thu, 13 May 2010 13:26:30 +0000 (18:56 +0530)
commit	8866e54ca92fe03e29fa9d8f31db9e9d2f8b0d37
tree	e1985c74f18f182e95b83b469e5b646f6521d8bd	tree \| snapshot
parent	2331abec581a06108daf81b60377d439149f4ba7	commit \| diff
parent	d7c1fcbf7b7e33eb09c1bfd2bae0a8359d3b23df	commit \| diff

[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100513132630-9d4y5ucn35m7tbvj

16 files changed:

addons/base_setup/installer.py	diff1 \|	diff2 \|	blob \| history
addons/board_crm/board_crm_statistical_view.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/crm.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_meeting_menu.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_opportunity_view.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_view.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_send_email.py	diff1 \|	diff2 \|	blob \| history
addons/document/document_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment.py	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/report/hr_recruitment_report_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py	diff1 \|	\|	blob \| history
addons/partner_infotab/partner_infotab.py	\|	diff2 \|	blob \| history
addons/partner_infotab/security/ir.model.access.csv	\|	diff2 \|	blob \| history
addons/sale_crm/sale_crm_view.xml	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.