projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a638cc3 bcf7db1)
[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Mon, 29 Oct 2012 05:56:26 +0000 (11:26 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Mon, 29 Oct 2012 05:56:26 +0000 (11:26 +0530)
bzr revid: mma@tinyerp.com-20121029055626-i5ymxz37oqyo567t

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.