projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7d4e3d 2724248)
[MERGE] Merge trunk upto revision 910.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 5 Sep 2011 12:35:25 +0000 (18:05 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 5 Sep 2011 12:35:25 +0000 (18:05 +0530)
bzr revid: vme@tinyerp.com-20110905123525-32m1df2936qryppw

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

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