projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d25ac32 b2bccf9)
[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:29:09 +0000 (15:59 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:29:09 +0000 (15:59 +0530)
bzr revid: fka@tinyerp.com-20120831102909-j91bo5zhtqggrwp9

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

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