qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch ... bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak		2011-01-14 01:11:01 +01:00
..
i18n	[MERGE] merge from trunk addons	2011-01-12 11:17:02 +05:30
process	merged with trunk	2010-12-30 15:28:09 +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
test	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
wizard	merged with trunk	2010-12-30 15:28:09 +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
board_hr_holidays_view.xml	merged with trunk	2010-12-30 15:28:09 +05:30
board_hr_manager_holidays_view.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_bel_holidays_2008.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_holidays.py	merged with trunk	2010-12-30 15:28:09 +05:30
hr_holidays_data.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_holidays_demo.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_holidays_report.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_holidays_view.xml	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
hr_holidays_wizard.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_holidays_workflow.xml	[MERGE] merge from trunk addons	2011-01-03 14:38:25 +05:30