projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c37c81 78f56f2)
[MERGE] merged with trunk-development-branch
authorHarry (OpenERP) <hmo@tinyerp.com>
Tue, 13 Dec 2011 09:46:56 +0000 (15:16 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Tue, 13 Dec 2011 09:46:56 +0000 (15:16 +0530)
bzr revid: hmo@tinyerp.com-20111213094656-4l13bf8hgub5hdr0

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

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