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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 17631ae a357aa8)

author	P. Christeas <p_christ@hol.gr>
	Wed, 10 Dec 2008 07:59:01 +0000 (09:59 +0200)
committer	P. Christeas <p_christ@hol.gr>
	Wed, 10 Dec 2008 07:59:01 +0000 (09:59 +0200)
commit	281c7c980a3bc955bc470ea829e6012b48b6a9ee
tree	f15f4d6394b33a63baa651fe4c6f916d02ada687	tree \| snapshot
parent	17631aef94b04c393664315d3d17cbe0051c3063	commit \| diff
parent	a357aa85e58859855761eae990f62e8600204010	commit \| diff

Merge commit 'origin/master' into mdv-gpl3

bzr revid: p_christ@hol.gr-20081207195509-2tb8fb3d7qr2xigt
bzr revid: p_christ@hol.gr-20081210075901-97mt6chs3ljokpsx

bin/addons/base/ir/ir.xml	diff1 \|	diff2 \|	blob \| history
bin/import_xml.rng	diff1 \|	diff2 \|	blob \| history
bin/netsvc.py	diff1 \|	diff2 \|	blob \| history
bin/osv/orm.py	diff1 \|	diff2 \|	blob \| history
bin/tools/convert.py	diff1 \|	diff2 \|	blob \| history
bin/tools/translate.py	diff1 \|	diff2 \|	blob \| history

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