Fabien Meghazi 5013315f57 [MERGE] upstream ... bzr revid: fme@openerp.com-20140122102358-te3vpyhblujbxkzt		2014-01-22 11:23:58 +01:00
..
addons	[REM] preprocess of widget selection on m2o	2014-01-21 12:27:59 +01:00
cli	[REF] Use the contextlib.closing function instead of a couple of try/catch for	2014-01-09 10:32:58 +01:00
conf	[MERGE] openerp.pooler is deprecated.	2013-03-27 17:40:45 +01:00
modules	[MERGE] forward port of branch 7.0 up to revid 5224 chs@openerp.com-20140206105141-7e8bv8ordqqsswh7	2014-02-06 12:02:20 +01:00
osv	[MERGE] Sync with trunk, solved conflicts.	2014-01-16 10:17:16 +01:00
report	[MERGE] forward port of branch 7.0 up to revid 5224 chs@openerp.com-20140206105141-7e8bv8ordqqsswh7	2014-02-06 12:02:20 +01:00
service	[MERGE] forward port of branch 7.0 up to revid 5224 chs@openerp.com-20140206105141-7e8bv8ordqqsswh7	2014-02-06 12:02:20 +01:00
tests	[MERGE] Sync with trunk, solved conflicts.	2014-01-16 10:17:16 +01:00
tools	[CLEAN] ir_qweb: simplified and cleaned QWebcontext implementation	2014-01-16 19:27:50 +01:00
workflow	[IMP] py26 compatibility	2014-01-20 14:53:33 +01:00
PKG-INFO	[REM] netrpc: KILL EVERYBODY	2013-02-21 13:18:25 +01:00
__init__.py	restore the original gevent detection	2013-09-10 01:19:46 +02:00
exceptions.py	[REF] code review	2013-02-15 15:35:03 +01:00
http.py	[MERGE] upstream	2014-01-22 11:23:58 +01:00
import_xml.rng	[IMP] Backport one feature from website: this feature allows to specify a file	2014-01-09 16:43:38 +01:00
loglevels.py	[REF] logging: removed pseudo log-level TEST.	2013-03-26 16:58:44 +01:00
netsvc.py	[FORWARD] Forward port of server 7.0 until revision 4988	2013-05-28 12:27:33 +02:00
pooler.py	[REF] pooler: mark the functions as deprecated.	2013-03-27 15:16:53 +01:00
release.py	[REL] saas-2	2013-09-23 12:44:53 +02:00
sql_db.py	[MERGE] forward merge 7.0 until revision 4919.	2013-04-04 15:07:04 +02:00