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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9d7a35a 08abc43)

author	Randhir Mayatra (OpenERP) <rma@tinyerp.com>
	Mon, 11 Nov 2013 12:42:49 +0000 (18:12 +0530)
committer	Randhir Mayatra (OpenERP) <rma@tinyerp.com>
	Mon, 11 Nov 2013 12:42:49 +0000 (18:12 +0530)
commit	55864d01e1dd134bd13c26706897a535a87e11d1
tree	c4f5f6253d1da9d64e624e9954afa443537eefbd	tree \| snapshot
parent	9d7a35accc2408dce35d9a499aac62ca7db3cf81	commit \| diff
parent	08abc4345a9d60ecd1b956e97066778dca1a90e1	commit \| diff

[MERGE] merge with latest trunk

bzr revid: rma@tinyerp.com-20131111124249-18c9hwxcw4c8276o

addons/base_calendar/i18n/sl.po	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.