git.inspyration.org Git - odoo/odoo.git/commit

author	Amit Patel (OpenERP) <apa@tinyerp.com>
	Fri, 29 Jun 2012 12:48:20 +0000 (18:18 +0530)
committer	Amit Patel (OpenERP) <apa@tinyerp.com>
	Fri, 29 Jun 2012 12:48:20 +0000 (18:18 +0530)
commit	5260efe7027f6f6dd09260082ef80325bcd90cb4
tree	3da421375f873a98552cdbdd82f82f2e514ba3e5	tree \| snapshot
parent	2ae4d917b0fad30ca8252c518f6ef4be81dbb418	commit \| diff
parent	37601079a987b0b20f22fff8963d22b1440b78b4	commit \| diff

[MERGE]:merged from trunk

bzr revid: apa@tinyerp.com-20120629124820-aec88wzcrvm6xps4

Unnamed repository; edit this file 'description' to name the repository.

addons/hr/hr_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_evaluation/hr_evaluation_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_payroll/hr_payroll_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml	diff1 \|	diff2 \|	blob \| history