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

author	Christophe Matthieu <chm@openerp.com>
	Tue, 30 Apr 2013 08:34:44 +0000 (10:34 +0200)
committer	Christophe Matthieu <chm@openerp.com>
	Tue, 30 Apr 2013 08:34:44 +0000 (10:34 +0200)
commit	d47824c79291b4904c5b3087b7bdf16fd84c0a50
tree	ec141eb2df81e07e89e0f5985c1aaf83eea97088	tree \| snapshot
parent	b8a5ec1dc9cfbac79fd8a540c01a7c0749c522f9	commit \| diff
parent	511efd43a90b6bbc30bac9764358fc81b42fb13a	commit \| diff

[MERGE] from trunk

bzr revid: chm@openerp.com-20130430083444-r300f3a2s5kgbj9k

22 files changed:

addons/web/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/http.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.css	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/fixbind.js	\|	\|	blob
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/data.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/formats.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/search.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/testing.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_list.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/static/test/data.js	\|	\|	blob
addons/web/static/test/search.js	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/calendar.js	diff1 \|	diff2 \|	blob \| history
addons/web_diagram/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/css/kanban.css	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/css/kanban.sass	diff1 \|	diff2 \|	blob \| history
addons/web_view_editor/static/src/js/view_editor.js	diff1 \|	diff2 \|	blob \| history

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

addons/web/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/http.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.css	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/fixbind.js	\|	\|	blob
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/data.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/formats.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/search.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/testing.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_list.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/static/test/data.js	\|	\|	blob
addons/web/static/test/search.js	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/calendar.js	diff1 \|	diff2 \|	blob \| history
addons/web_diagram/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/css/kanban.css	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/css/kanban.sass	diff1 \|	diff2 \|	blob \| history
addons/web_view_editor/static/src/js/view_editor.js	diff1 \|	diff2 \|	blob \| history