← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/doc_generate/conf.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

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