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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: edf9d5e 00d3d9a)

author	Randhir Mayatra (OpenERP) <rma@tinyerp.com>
	Fri, 30 Aug 2013 05:36:21 +0000 (11:06 +0530)
committer	Randhir Mayatra (OpenERP) <rma@tinyerp.com>
	Fri, 30 Aug 2013 05:36:21 +0000 (11:06 +0530)
commit	606431f0eea3281335e3dae8220785b3ef4f6573
tree	b5ecbd70ea77db5b1cb3f4e7a9c617a84fa3420f	tree \| snapshot
parent	edf9d5ef8e6c0c505021eca3ef92a91f8b1084c6	commit \| diff
parent	00d3d9a4b6ee444e68b2db28f0726192a686a411	commit \| diff

[MERGE]merge with parent

bzr revid: rma@tinyerp.com-20130830053621-briu78l6scvuleu4

addons/account/account_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history

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