Thibault Delavallée 8454553a5b [DOC] Updated merge documentation. ... bzr revid: tde@openerp.com-20120313104155-221i8zfzfs03yenq		2012-03-13 11:41:55 +01:00
..
_static	[IMP] added doc directory, intended to be included in the new openerp technical documentation.	2012-02-18 21:31:01 +01:00
_templates	[DOC] change v6.1 reference to trunk.	2012-03-05 17:45:52 +01:00
_themes	[DOC] changed temporary thu.openerp.com to doc.openerp.com.	2012-03-02 16:56:29 +01:00
api	[DOC] Updated merge documentation.	2012-03-13 11:41:55 +01:00
source	[DOC] use a flat (i.e. no source/ directory) structure.	2012-03-05 13:40:16 +01:00
Makefile	[DOC] use a flat (i.e. no source/ directory) structure.	2012-03-05 13:40:16 +01:00
conf.py	[DOC] change v6.1 reference to trunk.	2012-03-05 17:45:52 +01:00
index.rst	[MERGE] Merged with main server	2012-03-08 09:39:04 +01:00
index.rst.inc	[DOC] Added merge proposal documentation	2012-03-13 09:57:43 +01:00
make.bat	[DOC] use a flat (i.e. no source/ directory) structure.	2012-03-05 13:40:16 +01:00
test-framework.rst	[DOC] moved FEATURES.rst to doc/.	2012-03-05 15:07:38 +01:00