P. Christeas 1f6278b32c 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

2009-01-22 19:59:10 +02:00

..

addons

Merge branch 'master' of openobject-server into mdv-gpl3-py26

2009-01-22 19:59:10 +02:00

ir

[IMP] Update the copyright to 2009

2009-01-04 23:13:29 +01:00

osv

Merge branch 'master' of openobject-server into mdv-gpl3-py26

2009-01-22 19:59:10 +02:00

report

Merge branch 'master' of openobject-server into mdv-gpl3-py26

2009-01-22 19:59:10 +02:00

service

[IMP] Error handling and don't save the zip file in the addons path for the migration, but only the module directory

2009-01-22 14:23:38 +01:00

ssl

Merge branch 'master' of openobject-server into mdv-gpl3-fwd

2008-12-23 17:46:08 +02:00

tools

Merge branch 'master' of openobject-server into mdv-gpl3-py26

2009-01-22 19:59:10 +02:00

wizard

[IMP] Update the copyright to 2009

2009-01-04 23:13:29 +01:00

workflow

[IMP] Update the copyright to 2009

2009-01-04 23:13:29 +01:00

__init__.py

[IMP] Update the copyright to 2009

2009-01-04 23:13:29 +01:00

gpl.txt

[REV] Add the gpl.txt file

2009-01-22 14:26:56 +01:00

import_xml.rng

Merge branch 'master' of openobject-server into mdv-gpl3-py26

2009-01-22 19:59:10 +02:00

netsvc.py

Merge branch 'master' of openobject-server into mdv-gpl3-py26

2009-01-22 19:59:10 +02:00

openerp-server.py

Merge branch 'master' of openobject-server into mdv-gpl3-py26

2009-01-22 19:59:10 +02:00

PKG-INFO

[IMP] OpenERP 5.0-rc3

2009-01-03 03:35:11 +01:00

pooler.py

[FIX] when a module can not be loaded, the pool is delete, allowing to recreate a new pool...

2009-01-07 15:52:34 +01:00

release.py

[IMP] Update the copyright to 2009

2009-01-04 23:13:29 +01:00

server.cert

…

server.pkey

…

sql_db.py

Merge branch 'master' of openobject-server into mdv-gpl3-py26

2009-01-22 19:59:10 +02:00

tiny_socket.py

bugfixes

2009-01-15 18:41:03 +01:00