git.inspyration.org Git - odoo/odoo.git/commit

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f84b1e9 2724036)

author	P. Christeas <p_christ@hol.gr>
	Sat, 31 Jan 2009 10:08:04 +0000 (12:08 +0200)
committer	P. Christeas <p_christ@hol.gr>
	Sat, 31 Jan 2009 10:08:04 +0000 (12:08 +0200)
commit	b69c19fbb2a56de017f466c76d06addd968c96ce
tree	18fd5664613588c2901a5ede849592ddba2b3e9d	tree \| snapshot
parent	f84b1e90e73969887f9e1ae6e43548c3d853c7e8	commit \| diff
parent	27240361ca5ead2597ae8f0c63043bab0e969001	commit \| diff

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

Conflicts:
bin/netsvc.py
bin/tools/translate.py

bzr revid: p_christ@hol.gr-20090131100804-pu97gelwjh1flk3h

bin/addons/__init__.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
bin/netsvc.py	diff1 \|	diff2 \|	blob \| history
bin/osv/orm.py	diff1 \|	diff2 \|	blob \| history
bin/report/interface.py	diff1 \|	diff2 \|	blob \| history
bin/tools/config.py	diff1 \|	diff2 \|	blob \| history
bin/tools/translate.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.