/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 doc/ru/conf.py

  • Committer: Gordon Tyler
  • Date: 2011-09-09 12:42:32 UTC
  • mto: (6015.33.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: gordon@doxxx.net-20110909124232-ip0bgx4tx6y5fya6
Use get_user_option in get_merge_tools so that quoted values are correctly unquoted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 ##