← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/developers/conf.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-16 17:57:43 UTC
  • mfrom: (6437.3.3 2.5)
  • mto: This revision was merged to the branch mainline in revision 6439.
  • Revision ID: v.ladeuil+lp@free.fr-20120116175743-ohoqm6cmht09u793
Merge 2.5 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/conf.py
13
13
sys.path = [os.path.abspath('../..')] + sys.path
14
14
 
15
15
# Most of the configuration for Bazaar docs is defined here ...
16
 
from bzrlib.doc_generate.sphinx_conf import *
 
16
from bzrlib.doc_generate.conf import *
17
17
 
18
18
 
19
19
## Configuration specific to this site ##