projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 97e946c 1f1556f)
Merge commit 'origin/master' into mdv-gpl3
authorP. Christeas <p_christ@hol.gr>
Tue, 4 Nov 2008 20:12:38 +0000 (22:12 +0200)
committerP. Christeas <p_christ@hol.gr>
Tue, 4 Nov 2008 20:12:38 +0000 (22:12 +0200)
commit8220e0ad02c27bbcdae91a0a04aa7e0d1cf72cef
treead40bb98b0fb987e07a4a48647d60509ad107a6dtree | snapshot
parent97e946c466d1dce6cb62c52ac627a2be0721cd63commit | diff
parent1f1556ffba922823a7771ac41c1d7f3fdbaf4a29commit | diff
Merge commit 'origin/master' into mdv-gpl3

Conflicts:
bin/tools/convert.py

bzr revid: p_christ@hol.gr-20081025224421-g367ati5b2eeplw6
bzr revid: p_christ@hol.gr-20081104201238-oy0vgsunt2jxgu2p
bin/addons/base/ir/ir.xml diff1 | diff2 | blob | history
bin/addons/base/security/base_security.xml diff1 | diff2 | blob | history
bin/netsvc.py diff1 | diff2 | blob | history
bin/openerp-server.py diff1 | diff2 | blob | history
bin/osv/orm.py diff1 | diff2 | blob | history
bin/report/printscreen/ps_list.py diff1 | diff2 | blob | history
bin/ssl/SecureXMLRPCServer.py diff1 | diff2 | blob | history
bin/tools/convert.py diff1 | diff2 | blob | history
bin/tools/translate.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.