projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b74038 10513dc)
[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 3 Oct 2012 15:11:48 +0000 (17:11 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 3 Oct 2012 15:11:48 +0000 (17:11 +0200)
bzr revid: fva@openerp.com-20121003151148-wp9lr9fxv9eq3lob

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

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