[med-svn] [pycorrfit] 02/04: Merge tag 'upstream/0.9.2+dfsg'

[Alex Mestiashvili]

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

malex-guest pushed a commit to branch master
in repository pycorrfit.

commit d3caecb21411c2a4be2a515675aeb71b0a12c371
Merge: ef44160 ce9c648
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Fri Nov 6 13:55:13 2015 +0100

    Merge tag 'upstream/0.9.2+dfsg'
    
    Upstream version 0.9.2+dfsg

 ChangeLog.txt                                      |    8 +
 pycorrfit/doc.py                                   |    3 +-
 pycorrfit/fcs_data_set.py                          |    5 +-
 pycorrfit/readfiles/read_FCS_Confocor3.py          |   67 +-
 pycorrfit/readfiles/read_pt3_PicoQuant.py          |   42 +-
 pycorrfit/readfiles/read_pt3_scripts/README        |   14 +
 pycorrfit/readfiles/read_pt3_scripts/__init__.py   |    1 +
 .../readfiles/read_pt3_scripts/__version__.py      |    2 +
 .../read_pt3_scripts/correlation_methods.py        |   14 +-
 .../read_pt3_scripts/correlation_objects.py        | 1352 ++++++++++++--------
 .../readfiles/read_pt3_scripts/fitting_methods.py  |  349 +++++
 .../readfiles/read_pt3_scripts/import_methods.py   |   32 +
 pycorrfit/readfiles/util.py                        |   48 +
 pycorrfit/tools/parmrange.py                       |    6 +-
 pycorrfit/tools/simulation.py                      |   32 +-
 pycorrfit/tools/trace.py                           |    7 +-
 16 files changed, 1379 insertions(+), 603 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/pycorrfit.git