projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bc6e053
4c96a05
)
[MERGE] with trunk
author
Foram Katharotiya (OpenERP)
<fka@tinyerp.com>
Fri, 12 Jul 2013 13:19:13 +0000
(18:49 +0530)
committer
Foram Katharotiya (OpenERP)
<fka@tinyerp.com>
Fri, 12 Jul 2013 13:19:13 +0000
(18:49 +0530)
bzr revid: fka@tinyerp.com-
20130712131913
-rbbk600xt3ru6uzw
1
2
addons/crm/crm_lead_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/crm_claim/crm_claim_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_expense/hr_expense_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_recruitment/hr_recruitment_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/point_of_sale/point_of_sale_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/stock/stock_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/crm/crm_lead_view.xml
Simple merge
diff --cc
addons/crm_claim/crm_claim_view.xml
Simple merge
diff --cc
addons/hr_expense/hr_expense_view.xml
Simple merge
diff --cc
addons/hr_recruitment/hr_recruitment_view.xml
Simple merge
diff --cc
addons/point_of_sale/point_of_sale_view.xml
Simple merge
diff --cc
addons/stock/stock_view.xml
Simple merge