projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db80540 b1ccfa6)
[MERGE] merged from lp:~openerp/openobject-addons/trunk/
authorHarry (Open ERP) <hmo@tinyerp.com>
Tue, 16 Mar 2010 06:38:22 +0000 (12:08 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Tue, 16 Mar 2010 06:38:22 +0000 (12:08 +0530)
bzr revid: hmo@tinyerp.com-20100315063749-trpjohgz9w9vcbu9
bzr revid: hmo@tinyerp.com-20100316063822-wzv7qggdi6makx94

1  2 
addons/mrp/mrp_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/mrp/mrp_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.