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

author	Jean-Baptiste Aubort <jean-baptiste.aubort@camptocamp.com>
	Fri, 22 Aug 2008 14:46:26 +0000 (16:46 +0200)
committer	Jean-Baptiste Aubort <jean-baptiste.aubort@camptocamp.com>
	Fri, 22 Aug 2008 14:46:26 +0000 (16:46 +0200)
commit	ed2c0e73c0168d3afad4f0b075586f0077239fb8
tree	dd61f36972bc5666eb587e55854ff09745aa4618	tree \| snapshot
parent	69c7cdbe767b85569b1584bd424ca88b4e9557f2	commit \| diff
parent	4f935d09cdfd7207dd3ae6415a6109ea4be1647a	commit \| diff

merge trunk #1015

bzr revid: jean-baptiste.aubort@camptocamp.com-20080822144626-kblv6krdoo4pema2

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

bin/addons/base/base.sql	diff1 \|	diff2 \|	blob \| history
bin/addons/base/base_security.xml	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir.xml	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/module/module_wizard.xml	diff1 \|	diff2 \|	blob \| history
bin/addons/base/res/partner/partner_view.xml	diff1 \|	diff2 \|	blob \| history
bin/osv/orm.py	diff1 \|	diff2 \|	blob \| history