projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5a27e3 540d03a)
[MERGE]
authorMustufa Rangwala <mra@mra-laptop>
Mon, 14 Jun 2010 10:55:44 +0000 (16:25 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Mon, 14 Jun 2010 10:55:44 +0000 (16:25 +0530)
bzr revid: mra@mra-laptop-20100614100240-axlzdg1krysaw9yo
bzr revid: mra@mra-laptop-20100614105544-t3qhl6s12u857dav

1  2 
addons/sale/sale_view.xml patch | diff1 | diff2 | blob | history
addons/stock/stock.py patch | diff1 | diff2 | blob | history

diff --cc addons/sale/sale_view.xml
Simple merge
diff --cc addons/stock/stock.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.