projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 362c3a1 e04df55)
[MERGE] branch merged with trunk-menus-improvements-warehouse-jap
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 5 Mar 2012 09:30:57 +0000 (15:00 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 5 Mar 2012 09:30:57 +0000 (15:00 +0530)
bzr revid: mtr@tinyerp.com-20120305093057-295j9zscg6f9r18s

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

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