[guidata] 02/03: Merge tag 'upstream/1.7.0_b5'

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository guidata.

commit cbd3a80ec6a34d83c2f190b4c21f99f39c49e430
Merge: bfec399 0e186e3
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Oct 5 14:03:38 2015 +0200

    Merge tag 'upstream/1.7.0_b5'
    
    Upstream version 1.7.0~b5
    
    Conflicts:
    	PKG-INFO
    	guidata.egg-info/PKG-INFO
    	guidata/__init__.py
    	guidata/qt/__init__.py

 MANIFEST.in                      |  3 +-
 PKG-INFO                         |  2 +-
 changelog                        |  2 +-
 doc/conf.py                      |  4 ++-
 doc/development.rst              | 25 +++++++--------
 doc/index.rst                    |  2 +-
 doc/installation.rst             |  9 ++++--
 doc/reference.rst                | 26 ----------------
 doc/reference/configtools.rst    |  2 ++
 doc/reference/dataset.rst        |  2 ++
 doc/reference/disthelpers.rst    |  2 ++
 doc/reference/index.rst          | 14 +++++++++
 doc/reference/qthelpers.rst      |  2 ++
 doc/reference/userconfig.rst     |  2 ++
 doc/reference/utils.rst          |  2 ++
 guidata.egg-info/PKG-INFO        |  2 +-
 guidata.egg-info/SOURCES.txt     |  8 ++++-
 guidata/__init__.py              | 10 +++---
 guidata/dataset/__init__.py      |  8 +++--
 guidata/dataset/qtitemwidgets.py | 12 +++++---
 guidata/dataset/qtwidgets.py     |  5 +++
 guidata/disthelpers.py           | 66 ++++++++++++++++++++++++----------------
 guidata/qt/__init__.py           | 41 ++++++++++++++-----------
 guidata/userconfig.py            |  3 +-
 24 files changed, 150 insertions(+), 104 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/guidata.git