projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82dfc15 2c55b93)
[MERGE] MErge with trunk upto revision no 1202.
authorYogesh (OpenERP) <ysa@tinyerp.com>
Tue, 11 Oct 2011 05:03:27 +0000 (10:33 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Tue, 11 Oct 2011 05:03:27 +0000 (10:33 +0530)
bzr revid: ysa@tinyerp.com-20111011050327-wsyzdd0x53yiat6h

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