projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f61360 b7f2284)
[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 28 Mar 2012 06:38:14 +0000 (12:08 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 28 Mar 2012 06:38:14 +0000 (12:08 +0530)
bzr revid: mdi@tinyerp.com-20120328063814-3uni052uwdnk0cpv

1  2 
addons/sale/sale_view.xml patch | diff1 | diff2 | blob | history
addons/stock/stock_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/sale/sale_view.xml
Simple merge
diff --cc addons/stock/stock_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.