merge with trunk

This commit is contained in:
Daniel Neuhäuser 2010-06-22 20:09:47 +02:00
commit 24bd58ea6c

View File

@ -42,7 +42,7 @@ import sys, os
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.append(os.path.abspath('.'))
#sys.path.insert(0, os.path.abspath('.'))
# -- General configuration -----------------------------------------------------