projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8fdcadc 519046b)
Merge commit 'origin/master' into mdv-gpl3-py26
authorP. Christeas <p_christ@hol.gr>
Wed, 6 May 2009 20:18:13 +0000 (23:18 +0300)
committerP. Christeas <p_christ@hol.gr>
Wed, 6 May 2009 20:18:13 +0000 (23:18 +0300)
commit3814e4dc7311301cc204e7f93b1c988cab795320
tree8309aab1cbca3b4b23ebcd3ce95fff78f5188738tree | snapshot
parent8fdcadcd9900f948f776c13543185ef4cc26445fcommit | diff
parent519046bfa4d8fb2451f71493a94584f3fa7f3280commit | diff
Merge commit 'origin/master' into mdv-gpl3-py26

Conflicts:
bin/report/interface.py
bin/report/printscreen/ps_list.py
bin/report/render/__init__.py
bin/report/render/rml.py
bin/report/render/rml2pdf/trml2pdf.py
bin/sql_db.py

bzr revid: p_christ@hol.gr-20090506201813-qb71ec85xr08obb1
12 files changed:
bin/addons/__init__.py diff1 | diff2 | blob | history
bin/addons/base/base.sql diff1 | diff2 | blob | history
bin/addons/base/ir/ir_actions.py diff1 | diff2 | blob | history
bin/addons/base/rng/view.rng diff1 | diff2 | blob | history
bin/osv/orm.py diff1 | diff2 | blob | history
bin/report/interface.py diff1 | diff2 | blob | history
bin/report/render/__init__.py diff1 | diff2 | blob | history
bin/report/render/rml.py diff1 | diff2 | blob | history
bin/report/render/rml2pdf/trml2pdf.py diff1 | diff2 | blob | history
bin/sql_db.py diff1 | diff2 | blob | history
bin/tools/misc.py diff1 | diff2 | blob | history
setup.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.