projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c1ad19 9b02aed)
[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 16 Jan 2012 11:04:34 +0000 (12:04 +0100)
committerVo Minh Thu <vmt@openerp.com>
Mon, 16 Jan 2012 11:04:34 +0000 (12:04 +0100)
bzr revid: vmt@openerp.com-20120112155027-u3bagec0g9fqr0yi
bzr revid: vmt@openerp.com-20120116110434-ckhp01ze83cwm32y

1  2 
openerp-server patch | diff1 | diff2 | blob | history
openerp/osv/orm.py patch | diff1 | diff2 | blob | history

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