projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 969ea54 fe82cf7)
Merge commit 'origin/master' into xrg (5.0.3 official)
authorP. Christeas <p_christ@hol.gr>
Sun, 23 Aug 2009 10:02:10 +0000 (13:02 +0300)
committerP. Christeas <p_christ@hol.gr>
Sun, 23 Aug 2009 10:02:10 +0000 (13:02 +0300)
commit8cbe393b52d03d7f0d90275b57dc11a5b356e803
tree512c7953a59ea64582796d217fec1ac624eb0102tree | snapshot
parent969ea54ee67ed6f5fd5171db46b8b9b52ee634d9commit | diff
parentfe82cf7fac1bfc8583ef77e29e30a44e8f290d9bcommit | diff
Merge commit 'origin/master' into xrg (5.0.3 official)

Conflicts:
bin/netsvc.py
bin/tools/config.py
bin/workflow/instance.py

bzr revid: p_christ@hol.gr-20090823100210-2py390qp3hym8jlp
bin/netsvc.py diff1 | diff2 | blob | history
bin/osv/expression.py diff1 | diff2 | blob | history
bin/osv/orm.py diff1 | diff2 | blob | history
bin/report/render/rml2pdf/trml2pdf.py diff1 | diff2 | blob | history
bin/report/report_sxw.py diff1 | diff2 | blob | history
bin/tools/misc.py diff1 | diff2 | blob | history
bin/tools/translate.py diff1 | diff2 | blob | history
bin/workflow/instance.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.