projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a7c0bf 2a1d7c2)
[Merge] Merge with Trunk Server
authorVir (Open ERP) <vir@tinyerp.com>
Tue, 1 Jun 2010 05:38:40 +0000 (11:08 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Tue, 1 Jun 2010 05:38:40 +0000 (11:08 +0530)
bzr revid: vir@tinyerp.com-20100601053840-z183q5is7js83sb9

1  2 
bin/tools/misc.py patch | diff1 | diff2 | blob | history

diff --cc bin/tools/misc.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.