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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6de2150 1885387)

author	Thibault Delavallée <tde@openerp.com>
	Tue, 14 Aug 2012 15:21:28 +0000 (17:21 +0200)
committer	Thibault Delavallée <tde@openerp.com>
	Tue, 14 Aug 2012 15:21:28 +0000 (17:21 +0200)
commit	d669073fc35f8d3ebccef050d473a51810cc01f7
tree	07cb8d95c87ecba49602a2d468b3740c89ce0c98	tree \| snapshot
parent	6de2150126c17ff104325858abada6d3c2c82925	commit \| diff
parent	1885387ace913bd062cb1b86988b44707571878a	commit \| diff

[MERGE] Merged with server/trunk.

bzr revid: tde@openerp.com-20120814152128-s1pstrcc38j89p4z

openerp/addons/base/base_data.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users_view.xml	diff1 \|	diff2 \|	blob \| history

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