projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6aef840 d8df2d5)
[MERGE] Merge with last trunk
authorAntoine Huvelle <ahu@openerp.com>
Mon, 19 Dec 2011 13:35:16 +0000 (14:35 +0100)
committerAntoine Huvelle <ahu@openerp.com>
Mon, 19 Dec 2011 13:35:16 +0000 (14:35 +0100)
bzr revid: ahu@openerp.com-20111219133516-un3z9d7ws6b3rvix

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

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