projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bef293a 58ccbfc)
[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 5 Apr 2013 13:32:37 +0000 (15:32 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 5 Apr 2013 13:32:37 +0000 (15:32 +0200)
bzr revid: tde@openerp.com-20130405110750-1dd4y02xz3wb6ill
bzr revid: tde@openerp.com-20130405133237-n7k66b3w0b3a17o3

1  2 
openerp/addons/base/ir/ir_actions.py patch | diff1 | diff2 | blob | history
openerp/addons/base/res/res_partner_view.xml 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.