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

author	Vidhin Mehta (OpenERP) <vme@tinyerp.com>
	Tue, 22 Nov 2011 06:17:53 +0000 (11:47 +0530)
committer	Vidhin Mehta (OpenERP) <vme@tinyerp.com>
	Tue, 22 Nov 2011 06:17:53 +0000 (11:47 +0530)
commit	67e7ba0d0037e82196d34c4a0e57244ea40f015e
tree	af48ad5669afedcb28bd3ab9a862f3ec5a50e332	tree \| snapshot
parent	d206d8dc42f4c364a407637d346e18d01ae4eaad	commit \| diff
parent	1a2277c1407315546559eb8ed838018febcba9d5	commit \| diff

[MERGE]resove conflict and merge with main branch.

bzr revid: vme@tinyerp.com-20111122061753-5uxqy3mxw0eedthn

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

addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/data.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_editor.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/views.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/calendar.js	diff1 \|	diff2 \|	blob \| history
addons/web_dashboard/static/src/js/dashboard.js	diff1 \|	diff2 \|	blob \| history