projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cd651e 73249fc)
[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Mon, 6 Sep 2010 05:14:46 +0000 (10:44 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Mon, 6 Sep 2010 05:14:46 +0000 (10:44 +0530)
bzr revid: uco@tinyerp.com-20100903114446-fff9fngmnrds99d0
bzr revid: uco@tinyerp.com-20100906051446-7mtd0e5ihdctm1wf

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.