projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d74d5d3
29fffbc
)
[MERGE] trunk
author
Antonin Bourguignon
<abo@openerp.com>
Mon, 5 Nov 2012 10:15:38 +0000
(11:15 +0100)
committer
Antonin Bourguignon
<abo@openerp.com>
Mon, 5 Nov 2012 10:15:38 +0000
(11:15 +0100)
bzr revid: abo@openerp.com-
20121105101538
-tdgu6bi8vp2lnqru
1
2
addons/hr/__openerp__.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_expense/hr_expense_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_holidays/hr_holidays_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_recruitment/hr_recruitment.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/hr/__openerp__.py
Simple merge
diff --cc
addons/hr_expense/hr_expense_view.xml
Simple merge
diff --cc
addons/hr_holidays/hr_holidays_view.xml
Simple merge
diff --cc
addons/hr_recruitment/hr_recruitment.py
Simple merge
projects / odoo / odoo.git / commitdiff