projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3e7478 5624818)
[MERGE] trunk
authorFabien Meghazi <fme@openerp.com>
Wed, 19 Dec 2012 09:01:28 +0000 (10:01 +0100)
committerFabien Meghazi <fme@openerp.com>
Wed, 19 Dec 2012 09:01:28 +0000 (10:01 +0100)
bzr revid: fme@openerp.com-20121219090128-m5z0l5rlee8mu6hj

1  2 
addons/web/static/src/js/chrome.js patch | diff1 | diff2 | blob | history
addons/web/static/src/xml/base.xml patch | diff1 | diff2 | blob | history

diff --cc addons/web/static/src/js/chrome.js
Simple merge
diff --cc addons/web/static/src/xml/base.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.