projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f29be67 9769884)
[MERGE] file_open: give precedence to directory before zip, courtesy of Florent Xicluna
authorOlivier Dony <odo@openerp.com>
Mon, 3 Sep 2012 13:05:36 +0000 (15:05 +0200)
committerOlivier Dony <odo@openerp.com>
Mon, 3 Sep 2012 13:05:36 +0000 (15:05 +0200)
lp bug: https://launchpad.net/bugs/928376 fixed
lp bug: https://launchpad.net/bugs/928507 fixed

bzr revid: odo@openerp.com-20120903130536-5sqwp9tnhk1ntee3

1  2 
openerp/modules/module.py patch | diff1 | diff2 | blob | history
openerp/tools/misc.py patch | diff1 | diff2 | blob | history

diff --cc openerp/modules/module.py
Simple merge
diff --cc openerp/tools/misc.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.