projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eeaa684 6de3dcb)
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authoraag (OpenERP) <aag@tinyerp.co.in>
Fri, 12 Nov 2010 06:22:48 +0000 (11:52 +0530)
committeraag (OpenERP) <aag@tinyerp.co.in>
Fri, 12 Nov 2010 06:22:48 +0000 (11:52 +0530)
bzr revid: aag@tinyerp.co.in-20101112062248-7lou4kg8f6fazw1f

1  2 
addons/procurement/i18n/it.po patch | diff1 | diff2 | blob | history
addons/sale/sale_view.xml patch | diff1 | diff2 | blob | history
addons/sale/security/sale_security.xml patch | diff1 | diff2 | blob | history

diff --cc addons/procurement/i18n/it.po
Simple merge
diff --cc addons/sale/sale_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.