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

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit cbe7724b843bf22fd0142b001fb81d024480adfb
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Sun Mar 6 22:51:53 2011 +0100

    Unapply patches from source

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches
diff --git a/doc/conf.py b/doc/conf.py
index b3588a2..3616f09 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -94,8 +94,6 @@ 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