Xavier Morel e178185b4f [MERGE] bug fixes form 6.1 branch ... bzr revid: xmo@openerp.com-20120305070634-li0eloj7vhsljguu		2012-03-05 08:06:34 +01:00
..
common	[REL] OpenERP 6.1.1	2012-02-22 12:43:22 +01:00
controllers	[MERGE] bug fixes form 6.1 branch	2012-03-05 08:06:34 +01:00
i18n	Launchpad automatic translations update.	2012-03-05 05:11:29 +00:00
static	[MERGE] bug fixes form 6.1 branch	2012-03-05 08:06:34 +01:00
test	rename base into web part1	2011-09-05 13:03:09 +02:00
__init__.py	[FIX] imports to handle conflicts with e.g. web.py in embedded mode	2012-02-10 11:34:26 +01:00
__openerp__.py	[merge]	2012-02-27 14:20:24 +01:00