projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 491c3b7 067cd7d)
[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 22 Mar 2013 09:09:38 +0000 (10:09 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 22 Mar 2013 09:09:38 +0000 (10:09 +0100)
bzr revid: tde@openerp.com-20130322090938-xoh67sg08m3ylcrk

1  2 
openerp/addons/base/ir/ir_actions.py patch | diff1 | diff2 | blob | history
openerp/osv/orm.py patch | diff1 | diff2 | blob | history

diff --cc openerp/addons/base/ir/ir_actions.py
Simple merge
diff --cc openerp/osv/orm.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.