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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 936f5b3 adf5e54)

author	sbh (Open ERP) <sbh@tinyerp.com>
	Wed, 13 Jan 2010 06:09:37 +0000 (11:39 +0530)
committer	sbh (Open ERP) <sbh@tinyerp.com>
	Wed, 13 Jan 2010 06:09:37 +0000 (11:39 +0530)
commit	9e7cd31f0eb6e25e605e8d2dddfe2c676252a035
tree	d05cdaf2cfe8b577ffde75437f3756407772f096	tree \| snapshot
parent	936f5b3cd6d83730401fde1564b70557806d4ab2	commit \| diff
parent	adf5e544fbfd3fcdc0af4d7699a08fc9ea22ddfc	commit \| diff

merge

bzr revid: sbh@tinyerp.com-20100113060937-yyj1m6h2r8yxngsj

15 files changed:

addons/crm/__init__.py	diff1 \|	diff2 \|	blob \| history
addons/crm/__terp__.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_claim.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_fundraising.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_helpdesk.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_meeting_view.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_opportunity.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_phonecall.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/__init__.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_lead_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_opportunity_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_phonecall_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history

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