projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9880957 fbf6708)
[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 12:03:44 +0000 (17:33 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 12:03:44 +0000 (17:33 +0530)
bzr revid: mma@tinyerp.com-20110915120344-ha0ibavdwfmi5ehn

1  2 
addons/product/product.py patch | diff1 | diff2 | blob | history
addons/product/product_view.xml patch | diff1 | diff2 | blob | history

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