projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfc2ae4 f6722a2)
[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Mon, 22 Oct 2012 05:15:23 +0000 (10:45 +0530)
committerAmit Patel <apa@tinyerp.com>
Mon, 22 Oct 2012 05:15:23 +0000 (10:45 +0530)
bzr revid: apa@tinyerp.com-20121017070937-52t28h5twjkj5rlr
bzr revid: apa@tinyerp.com-20121019062157-qxy9gw1b5d9siipp
bzr revid: apa@tinyerp.com-20121022051523-v89anrokk46jxmqb

1  2 
addons/account/account_view.xml patch | diff1 | diff2 | blob | history
addons/mail/mail_thread.py patch | diff1 | diff2 | blob | history
addons/point_of_sale/static/src/css/pos.css patch | diff1 | diff2 | blob | history

diff --cc addons/account/account_view.xml
Simple merge
diff --cc addons/mail/mail_thread.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.