diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-01-22 19:59:10 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-01-22 19:59:10 +0200 |
| commit | 1f6278b32c2e675bcf316478ca0f0f886be14721 (patch) | |
| tree | 597e8e618dee0f9bc21ebd20cb3ac9916d08830f /sql | |
| parent | 69bdb830a49c022776ea49b1f1acbd4a18b8ac88 (diff) | |
| parent | b926a1eb35bab43952874a907b2dcb16f23db4cf (diff) | |
Merge branch 'master' of openobject-server into mdv-gpl3-py26
Conflicts:
bin/addons/base/ir/ir.xml
bin/osv/orm.py
bin/sql_db.py
bin/tools/config.py
bzr revid: p_christ@hol.gr-20090122175910-4apjfo1p7iokatm6
Diffstat (limited to 'sql')
0 files changed, 0 insertions, 0 deletions