mtr 0cea2e7269 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 ... bzr revid: mtr@mtr-20110106111216-j05lwp2ftz92j2ul		2011-01-06 16:42:16 +05:30
..
i18n	[MERGE] survey: type (wating => waiting answer)	2011-01-06 14:13:52 +05:30
report	merged with trunk	2010-12-30 15:28:09 +05:30
security	merged with trunk	2010-12-30 15:28:09 +05:30
specification	merged with trunk	2010-12-30 15:28:09 +05:30
test	merged with trunk	2010-12-30 15:28:09 +05:30
wizard	[MERGE] merge from trunk addons	2011-01-03 14:38:25 +05:30
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	merged with trunk	2010-12-30 15:28:09 +05:30
survey.py	[FIX] survey: Renamed state name	2011-01-06 11:04:22 +05:30
survey_data.xml	merged with trunk	2010-12-30 15:28:09 +05:30
survey_demo.xml	[IMP] crm_helpdesk,hr_expense,purchase,purchase_requisition,survey:changed static date of 2010 to current date	2011-01-06 16:25:20 +05:30
survey_report.xml	merged with trunk	2010-12-30 15:28:09 +05:30
survey_view.xml	[MERGE] merge from trunk addons	2011-01-03 14:38:25 +05:30