projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c6f262 a203832)
[Merge] Merge with main server.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 12 Jun 2012 05:15:46 +0000 (10:45 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 12 Jun 2012 05:15:46 +0000 (10:45 +0530)
bzr revid: mdi@tinyerp.com-20120612051546-1zgaes8f5so9hy2o

1  2 
openerp/addons/base/ir/ir.xml patch | diff1 | diff2 | blob | history
openerp/addons/base/ir/ir_filters.xml patch | diff1 | diff2 | blob | history

diff --cc openerp/addons/base/ir/ir.xml
Simple merge
diff --cc openerp/addons/base/ir/ir_filters.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.