projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b3042e eb4d14c)
[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 28 Nov 2012 04:23:11 +0000 (09:53 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 28 Nov 2012 04:23:11 +0000 (09:53 +0530)
bzr revid: mdi@tinyerp.com-20121128042311-283p5q84yyum4nkb

1  2 
addons/crm/crm_lead_view.xml patch | diff1 | diff2 | blob | history
addons/stock/stock.py patch | diff1 | diff2 | blob | history
addons/stock/stock_view.xml patch | diff1 | diff2 | blob | history

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