projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13dfee0 c8d64b6)
[MERGE] sync with trunk
authorOlivier Dony <odo@openerp.com>
Wed, 26 Sep 2012 12:56:57 +0000 (14:56 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 26 Sep 2012 12:56:57 +0000 (14:56 +0200)
bzr revid: odo@openerp.com-20120919155441-hnx35t23j3k3pvkd
bzr revid: odo@openerp.com-20120926125657-ixiqypb319fxdlab

1  2 
addons/web/controllers/main.py patch | diff1 | diff2 | blob | history
addons/web/static/src/xml/base.xml patch | diff1 | diff2 | blob | history

diff --cc addons/web/controllers/main.py
Simple merge
diff --cc addons/web/static/src/xml/base.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.