[sardana] 01/02: Merge tag 'upstream/1.4.2'

[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 sardana.

commit 85e976af749c549c1b24d8a2cd9b0063b8143be3
Merge: 7d56418 a1f646b
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon Oct 27 12:11:04 2014 +0100

    Merge tag 'upstream/1.4.2'
    
    Upstream version 1.4.2

 PKG-INFO                                           |   4 +-
 doc/man/MacroServer.1                              |   4 +-
 doc/man/{MacroServer.1 => MacroServer.py.1}        |   6 +-
 doc/man/Pool.1                                     |   4 +-
 doc/man/Sardana.1                                  |   4 +-
 doc/man/macroexecutor.1                            |   4 +-
 doc/man/sequencer.1                                |   4 +-
 doc/man/spock.1                                    |   4 +-
 setup.py                                           |   2 +-
 src/sardana/macroserver/scan/gscan.py              |  18 +-
 src/sardana/macroserver/scan/recorder/storage.py   |   2 +-
 .../pool/poolcontrollers/OneDControllerTimer.py    | 255 ++++++++++++
 src/sardana/release.py                             |   2 +-
 src/sardana/requirements.py                        |   2 +-
 src/sardana/sardanacustomsettings.py               |   5 +
 src/sardana/spock/release.py                       |   2 +-
 src/sardana/tango/core/util.py                     |   8 +-
 .../taurus/core/tango/sardana/macroserver.py       |   2 +-
 .../build/doctrees/environment.pickle              | Bin 0 -> 3633465 bytes
 .../build/doctrees/index.doctree                   | Bin 0 -> 3226 bytes
 .../build/doctrees/macrobutton.doctree             | Bin 0 -> 7220 bytes
 .../macrobutton/_DoorStateListener.doctree         | Bin 0 -> 8171 bytes
 .../doctrees/macrobutton/_MacroButton.doctree      | Bin 0 -> 39941 bytes
 .../macrobutton/_MacroButtonAbortDoor.doctree      | Bin 0 -> 11108 bytes
 .../doctrees/macrobutton/favouriteseditor.doctree  | Bin 0 -> 3931 bytes
 .../macrobutton/macroparameterseditor.doctree      | Bin 0 -> 3986 bytes
 .../doctrees/macrobutton/sequenceeditor.doctree    | Bin 0 -> 3911 bytes
 .../build/doctrees/macrobutton_AllClasses.doctree  | Bin 0 -> 5537 bytes
 .../qt/qtgui/extra_macroexecutor/build/index.rst   |  10 +
 .../extra_macroexecutor/build/macrobutton.rst      |  51 +++
 .../build/macrobutton/_DoorStateListener.rst       |  15 +
 .../build/macrobutton/_MacroButton.rst             |  15 +
 .../build/macrobutton/_MacroButtonAbortDoor.rst    |  15 +
 .../build/macrobutton/favouriteseditor.rst         |  17 +
 .../build/macrobutton/macroparameterseditor.rst    |  17 +
 .../build/macrobutton/sequenceeditor.rst           |  17 +
 .../build/macrobutton_AllClasses.rst               |  15 +
 .../taurus/qt/qtgui/extra_pool/compile_UIs.sh      |  32 --
 .../taurus/qt/qtgui/extra_pool/poolmotor.py        | 218 +++++++---
 .../taurus/qt/qtgui/extra_pool/poolmotor.py.tests  | 460 ---------------------
 40 files changed, 637 insertions(+), 577 deletions(-)

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