projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9237c2 689b7b7)
[MERGE] Merge with trunk-wms branche
authorjke-openerp <jke@openerp.com>
Tue, 29 Oct 2013 19:29:31 +0000 (20:29 +0100)
committerjke-openerp <jke@openerp.com>
Tue, 29 Oct 2013 19:29:31 +0000 (20:29 +0100)
bzr revid: jke@openerp.com-20131029192931-63zc0kd0qyr4e8m1

1  2 
addons/mrp/mrp_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/mrp/mrp_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.