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

author	Vidhin Mehta (OpenERP) <vme@tinyerp.com>
	Wed, 14 Sep 2011 05:37:46 +0000 (11:07 +0530)
committer	Vidhin Mehta (OpenERP) <vme@tinyerp.com>
	Wed, 14 Sep 2011 05:37:46 +0000 (11:07 +0530)
commit	b6076c3cc3ca5141349b99821268b8fd5e148b77
tree	bb875d3ef5127cf5b8c35de6475de14e5477dbbd	tree \| snapshot
parent	243e1bdb0079ea9f214696ead8228d464ecb2cfc	commit \| diff
parent	c7c2b5846d3775780bbaa9a84a93ad755bdb8756	commit \| diff

[Merge] upto revno 1024.

bzr revid: vme@tinyerp.com-20110914053746-ri6d5s341mm6tc7n

21 files changed:

addons/base_calendar/__openerp__.py	blob1 \|	blob2 \|	history
addons/web/__openerp__.py	\|	diff2 \|	blob \| history
addons/web/po/base.pot	\|	\|	blob
addons/web/po/fr_FR.po	\|	\|	blob
addons/web/static/src/css/base-ie7.css	\|	\|	blob
addons/web/static/src/js/boot.js	\|	diff2 \|	blob \| history
addons/web/static/src/js/core.js	\|	diff2 \|	blob \| history
addons/web/static/src/js/view_editor.js	\|	\|	blob
addons/web/static/src/js/views.js	\|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	\|	diff2 \|	blob \| history
addons/web_calendar/controllers/__init__.py	\|	\|	blob
addons/web_calendar/controllers/main.py	\|	\|	blob
addons/web_calendar/po/base_calendar.pot	\|	\|	blob
addons/web_dashboard/po/base_dashboard.pot	\|	\|	blob
addons/web_default_home/po/base_default_home.pot	\|	\|	blob
addons/web_diagram/po/base_diagram.pot	\|	\|	blob
addons/web_gantt/controllers/__init__.py	\|	\|	blob
addons/web_gantt/controllers/main.py	\|	\|	blob
addons/web_gantt/po/base_gantt.pot	\|	\|	blob
addons/web_graph/po/base_graph.pot	\|	\|	blob
addons/web_hello/po/base_hello.pot	\|	\|	blob

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