[SCM] dataset manipulation GUI generator branch, master, updated. upstream/1.2.2-23-gd173a3b

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 5da7670394dd3ffdbc9b7e263ca73c73d12f7009
Merge: 390df01054c562621de49787bd4b4224c0a54b72 d497a7f21f2abad09b14cedbd212d817ae30576b
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Thu Nov 18 16:08:04 2010 -0500

    Merge branch 'upstream'
    
    Conflicts:
    	setup.py

diff --combined doc/conf.py
index 98555de,38878ec..9026564
--- a/doc/conf.py
+++ b/doc/conf.py
@@@ -38,7 -38,7 +38,7 @@@ master_doc = 'index
  
  # General information about the project.
  project = u'guidata'
- copyright = u"2010, CEA - Commissariat à l'Energie Atomique"
+ copyright = u"2010, CEA - Commissariat à l'Energie Atomique et aux Energies Alternatives"
  
  # The version info for the project you're documenting, acts as replacement for
  # |version| and |release|, also used in various other places throughout the
@@@ -89,8 -89,6 +89,8 @@@ pygments_style = 'sphinx
  
  # -- 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 = 'default'

-- 
dataset manipulation GUI generator