/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/doc_generate/conf.py

  • Committer: Vincent Ladeuil
  • Date: 2011-12-19 16:41:49 UTC
  • mfrom: (6386 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6387.
  • Revision ID: v.ladeuil+lp@free.fr-20111219164149-ecfrvwscqb6v77jn
Merge trunk to resolve news conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/doc_generate/conf.py
6
6
# All configuration values have a default; values that are commented out
7
7
# serve to show the default.
8
8
 
9
 
import sys, os
 
9
from __future__ import absolute_import
10
10
 
11
11
# FIXME: better move the content of doc/en/conf.py here and cleanup the result
12
12
# -- vila 20100428