projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c04845 1e1936b)
[MEGRE] lp:openerp-web
authorJigar Amin - OpenERP <jam@tinyerp.com>
Thu, 16 Aug 2012 04:12:19 +0000 (09:42 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Thu, 16 Aug 2012 04:12:19 +0000 (09:42 +0530)
bzr revid: jam@tinyerp.com-20120816041219-xjdh003bs6zmc62h

1  2 
addons/web/static/src/js/view_form.js patch | diff1 | diff2 | blob | history
addons/web/static/src/js/view_list.js patch | diff1 | diff2 | blob | history
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/view_form.js
Simple merge
diff --cc addons/web/static/src/js/view_list.js
Simple merge
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.