projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 124ec45 6d2b354)
[MRG] merge with main addons.
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 13 Dec 2011 11:07:37 +0000 (16:37 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 13 Dec 2011 11:07:37 +0000 (16:37 +0530)
bzr revid: tpa@tinyerp.com-20111213110737-b33a8ponq9acpv9g

1  2 
addons/hr_evaluation/__openerp__.py patch | diff1 | diff2 | blob | history

diff --cc addons/hr_evaluation/__openerp__.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.