projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ab1b4f 750c5db)
[FIX] Merge last trunk
authorFabien Meghazi <fme@openerp.com>
Wed, 15 Feb 2012 09:59:40 +0000 (10:59 +0100)
committerFabien Meghazi <fme@openerp.com>
Wed, 15 Feb 2012 09:59:40 +0000 (10:59 +0100)
bzr revid: fme@openerp.com-20120215095940-2jv27t91i7u5mm0r

1  2 
addons/web/static/src/css/base.css patch | diff1 | diff2 | blob | history
addons/web/static/src/js/view_form.js 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/js/view_form.js
Simple merge
diff --cc addons/web/static/src/xml/base.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.