projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0f8272 20c2ebf)
[MERGE] merged with main trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 5 Dec 2011 15:08:19 +0000 (16:08 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 5 Dec 2011 15:08:19 +0000 (16:08 +0100)
bzr revid: qdp-launchpad@openerp.com-20111205150819-tuzcw6v25wp2aq9r

1  2 
addons/account/__openerp__.py patch | diff1 | diff2 | blob | history
addons/account/account.py patch | diff1 | diff2 | blob | history

diff --cc addons/account/__openerp__.py
Simple merge
diff --cc addons/account/account.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.