Frédéric van der Essen 192acbb383 [MERGE] from trunk ... bzr revid: fva@openerp.com-20121003151148-wp9lr9fxv9eq3lob		2012-10-03 17:11:48 +02:00
..
common	[FIX] outdated release info - this is not 6.1rc1 ;-)	2012-09-28 12:28:51 +02:00
controllers	[MERGE] Sync with trunk	2012-10-01 16:53:08 +02:00
i18n	Launchpad automatic translations update.	2012-10-03 05:28:27 +00:00
static	[MERGE] from trunk	2012-10-03 17:11:48 +02:00
test_support	[IMP] remove OpenERP Enterprise old code	2012-08-27 23:32:12 +02:00
tests	[FIX] integrate web tests into buildbot runner, fix broken tests	2012-09-10 12:51:29 +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	[REM] import from core, moving to module	2012-09-11 08:36:07 +02:00