Olivier Dony 50507512cb [MERGE] latest trunk ... This was a helluva merge, with hundreds of conflicts resolved manually!! I hope I did not break too many things, but a full review of the mail-related features (where most of the conflicts occurred) must still be done before this feature branch can be merged. bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf		2011-08-10 01:44:28 +02:00
..
i18n	Launchpad automatic translations update.	2011-08-05 04:40:24 +00:00
security	[ADD] base_calendar: Added Security file	2011-03-08 18:55:29 +05:30
test	[FIX] crm, base_calendar: Fixed yaml warnings.	2011-04-13 14:56:26 +05:30
wizard	email.addresss_id_repalce_by_user_email	2011-07-28 11:41:56 +05:30
__init__.py	[MERGE] manually calendar view from trunk-proto61-dhtmlx-scheduler-vda	2011-04-07 18:41:06 +02:00
__openerp__.py	[MERGE] latest trunk	2011-08-10 01:44:28 +02:00
base_calendar.py	[MERGE] latest trunk	2011-08-10 01:44:28 +02:00
base_calendar_data.xml	merged with trunk	2010-12-30 15:28:09 +05:30
base_calendar_view.xml	[FIX] crm meeting	2011-04-07 14:23:36 +02:00