projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45f3ff0 19b5efd)
merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 6 Nov 2008 16:56:55 +0000 (17:56 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 6 Nov 2008 16:56:55 +0000 (17:56 +0100)
bzr revid: fp@tinyerp.com-20081106165655-0m3mbe64mvevbugh

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

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