projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08e9757 1b76981)
merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 1 Sep 2010 16:42:25 +0000 (18:42 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 1 Sep 2010 16:42:25 +0000 (18:42 +0200)
bzr revid: fp@tinyerp.com-20100901164225-3o7njbh96drfvxnp

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

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