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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cd8a031 cb5339c)

author	Mayur Maheshwari (OpenERP) <mma@tinyerp.com>
	Wed, 21 Dec 2011 12:37:24 +0000 (18:07 +0530)
committer	Mayur Maheshwari (OpenERP) <mma@tinyerp.com>
	Wed, 21 Dec 2011 12:37:24 +0000 (18:07 +0530)
commit	357f3fca2feed21d1ef639bee53b5d7a2d70b71e
tree	911b21d5e5226c09f8d96b33161d290e452ffa8d	tree \| snapshot
parent	cd8a031e926f6e511b4edfe961b36b8fef0ce6b0	commit \| diff
parent	cb5339c3d92a90bce430bfe637e2ed408ebf6c55	commit \| diff

[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20111221123724-buifqfz9zvmu9s8n

14 files changed:

addons/account/account.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_bank_statement.py	diff1 \|	diff2 \|	blob \| history
addons/base_contact/base_contact.py	diff1 \|	diff2 \|	blob \| history
addons/base_report_creator/base_report_creator.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_operations/mrp_operations.py	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement.py	diff1 \|	diff2 \|	blob \| history
addons/project/project.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue.py	diff1 \|	diff2 \|	blob \| history
addons/project_long_term/project_long_term.py	diff1 \|	diff2 \|	blob \| history
addons/resource/resource.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history

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