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

author	Richard Mathot (OpenERP) <rim@openerp.com>
	Mon, 21 Oct 2013 12:03:11 +0000 (14:03 +0200)
committer	Richard Mathot (OpenERP) <rim@openerp.com>
	Mon, 21 Oct 2013 12:03:11 +0000 (14:03 +0200)
commit	a67126a19be80440db810c11a029a4a4ea3d129a
tree	1b9052938663f4a941cf3bfecc55a70ec98f3613	tree \| snapshot
parent	4869e4aa68eafe6e25e1a3dfee1f8caf994a645f	commit \| diff
parent	b766ede6593985b71c42a72a1269f63d7660d02a	commit \| diff

[MER] Merging upstream work

bzr revid: rim@openerp.com-20131021120311-2qfgftldcmbm640k

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

addons/base_calendar/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/hr_evaluation/security/hr_evaluation_security.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment.py	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment_data.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/hr_recruitment_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/test/recruitment_process.yml	diff1 \|	diff2 \|	blob \| history