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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3678e74 165b900)

author	Harry (OpenERP) <hmo@tinyerp.com>
	Fri, 18 Jun 2010 14:56:02 +0000 (20:26 +0530)
committer	Harry (OpenERP) <hmo@tinyerp.com>
	Fri, 18 Jun 2010 14:56:02 +0000 (20:26 +0530)
commit	9fd9c45e0b310e425c8b319aa9d8296fa176c248
tree	9fd23dc8d328cc28f1a01760529e33d9c9953f21	tree \| snapshot
parent	3678e74f3f64efdd01757c80c7d11ea29475d6cb	commit \| diff
parent	165b90054ed66aeef5b5713c8342e4d32d9c2d1f	commit \| diff

[MERGE]

bzr revid: hmo@tinyerp.com-20100618145602-hitjarz5yr5sbi6c

19 files changed:

addons/account/invoice.py	diff1 \|	diff2 \|	blob \| history
addons/base_contact/base_contact.py	diff1 \|	diff2 \|	blob \| history
addons/crm_profiling/crm_profiling.py	diff1 \|	diff2 \|	blob \| history
addons/document/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/document/document_directory.py	diff1 \|	diff2 \|	blob \| history
addons/document/document_storage.py	diff1 \|	diff2 \|	blob \| history
addons/document/document_view.xml	diff1 \|	diff2 \|	blob \| history
addons/document_webdav/webdav.py	diff1 \|	diff2 \|	blob \| history
addons/event/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/fetchmail/fetchmail.py	diff1 \|	diff2 \|	blob \| history
addons/idea/idea.py	diff1 \|	diff2 \|	blob \| history
addons/lunch/lunch.py	diff1 \|	diff2 \|	blob \| history
addons/membership/membership.py	diff1 \|	diff2 \|	blob \| history
addons/membership/membership_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/survey/survey.py	diff1 \|	diff2 \|	blob \| history
addons/wiki/wiki_view.xml	diff1 \|	diff2 \|	blob \| history

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