projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b30d01 3905f52)
[MERGE] Merged with main addons.
authorThibault Delavallée <tde@openerp.com>
Thu, 28 Jun 2012 12:44:20 +0000 (14:44 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 28 Jun 2012 12:44:20 +0000 (14:44 +0200)
bzr revid: tde@openerp.com-20120628124420-bxjjo2jhtzps0wsf

1  2 
addons/hr/hr.py patch | diff1 | diff2 | blob | history
addons/hr/hr_view.xml patch | diff1 | diff2 | blob | history
addons/product/product.py patch | diff1 | diff2 | blob | history
addons/product/product_view.xml patch | diff1 | diff2 | blob | history
addons/project/project_view.xml patch | diff1 | diff2 | blob | history
addons/stock/product_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/hr/hr.py
Simple merge
diff --cc addons/hr/hr_view.xml
Simple merge
diff --cc addons/product/product.py
Simple merge
diff --cc addons/product/product_view.xml
Simple merge
diff --cc addons/project/project_view.xml
Simple merge
diff --cc addons/stock/product_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.