projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 291f6cc 80fcbdb)
[MERGE] Merge the changes from main trunk branch.
authorJMA (OpenERP) <jma@tinyerp.com>
Wed, 16 Jun 2010 11:42:11 +0000 (17:12 +0530)
committerJMA (OpenERP) <jma@tinyerp.com>
Wed, 16 Jun 2010 11:42:11 +0000 (17:12 +0530)
bzr revid: jma@tinyerp.com-20100616114211-baomq9ypqtpbv3ck

1  2 
addons/mrp/mrp.py patch | diff1 | diff2 | blob | history
addons/stock/stock.py patch | diff1 | diff2 | blob | history

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