projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d4320a
c28dfb1
)
merge trunk
author
niv-openerp
<nicolas.vanhoren@openerp.com>
Tue, 2 Oct 2012 12:29:39 +0000
(14:29 +0200)
committer
niv-openerp
<nicolas.vanhoren@openerp.com>
Tue, 2 Oct 2012 12:29:39 +0000
(14:29 +0200)
bzr revid: nicolas.vanhoren@openerp.com-
20121002122939
-xr3by0mdqzri0lss
1
2
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
Simple merge