git.inspyration.org Git - odoo/odoo.git/commit

[MERGE] from trunk

bzr revid: xmo@openerp.com-20120322143331-iajlifomw1hohbht

Unnamed repository; edit this file 'description' to name the repository.

addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/core.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/data.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/search.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_page.js	diff1 \|	diff2 \|	blob \| history
addons/web_process/static/src/js/process.js	diff1 \|	diff2 \|	blob \| history
doc/async.rst	\|	\|	blob
doc/changelog-6.2.rst	\|	\|	blob
doc/index.rst	\|	diff2 \|	blob \| history
doc/rpc.rst	\|	\|	blob