[SCM] dataset manipulation GUI generator branch, master, updated. upstream/1.2.4-29-g47528b1

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit ad4fef4b33d309a61a9009ac8543aa86e24b118e
Merge: eb9c6c62eab82c5aec4a2f56a68d18d9bef75b0b 96c77d0fadd3c4f107e7af811bd33720e7913d7a
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Fri Dec 17 13:02:56 2010 -0500

    Merge commit 'upstream/1.2.5'

diff --combined doc/conf.py
index b346e2f,3616f09..b3588a2
--- a/doc/conf.py
+++ b/doc/conf.py
@@@ -23,6 -23,11 +23,11 @@@ import sys, o
  # Add any Sphinx extension module names here, as strings. They can be extensions
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
  extensions = ['sphinx.ext.autodoc']
+ try:
+     import sphinx.ext.viewcode
+     extensions.append('sphinx.ext.viewcode')
+ except ImportError:
+     print >>sys.stderr, "WARNING: the Sphinx viewcode extension was not found"
  
  # Add any paths that contain templates here, relative to this directory.
  templates_path = ['_templates']
@@@ -89,8 -94,6 +94,8 @@@ modindex_common_prefix = ['guidata.'
  
  # -- Options for HTML output ---------------------------------------------------
  
 +html_copy_source=False
 +
  # The theme to use for HTML and HTML Help pages.  Major themes that come with
  # Sphinx are currently 'default' and 'sphinxdoc'.
  html_theme = 'sphinxdoc'

-- 
dataset manipulation GUI generator