projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80e7857 048cfa7)
[MERGE] Merge with trunk upto revision no 1218.
authorYogesh (OpenERP) <ysa@tinyerp.com>
Wed, 12 Oct 2011 05:09:18 +0000 (10:39 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Wed, 12 Oct 2011 05:09:18 +0000 (10:39 +0530)
bzr revid: ysa@tinyerp.com-20111012050918-c83f2y42ocshk6e6

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