[med-svn] [pycorrfit] 05/12: Merge tag 'upstream/0.8.8+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 5e313960437896600fcc501d89c3e24e3fb6f463
Merge: 6937d28 e705b9f
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Fri May 29 18:04:00 2015 +0200

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

 .gitignore                                      |  66 ---
 ChangeLog.txt                                   |  36 +-
 LICENSE                                         | 293 ++++++++++
 MANIFEST.in                                     |   7 +-
 README.md                                       |   7 +-
 bin/pycorrfit                                   |   4 -
 doc/PyCorrFit_doc_content.tex                   |  44 +-
 pycorrfit/PyCorrFit.py                          |   4 +-
 pycorrfit/__init__.py                           |  30 +-
 pycorrfit/__main__.py                           |  23 +-
 pycorrfit/doc.py                                |  55 +-
 pycorrfit/edclasses.py                          |  34 +-
 pycorrfit/fcs_data_set.py                       | 739 ------------------------
 pycorrfit/fitting.py                            |  24 +-
 pycorrfit/frontend.py                           | 119 ++--
 pycorrfit/main.py                               |  64 +-
 pycorrfit/misc.py                               |  26 +-
 pycorrfit/models/MODEL_TIRF_1C.py               |  43 +-
 pycorrfit/models/MODEL_TIRF_2D2D.py             |  58 +-
 pycorrfit/models/MODEL_TIRF_3D2D.py             |  39 +-
 pycorrfit/models/MODEL_TIRF_3D2Dkin_Ries.py     |  81 +--
 pycorrfit/models/MODEL_TIRF_3D3D.py             |  43 +-
 pycorrfit/models/MODEL_TIRF_gaussian_1C.py      |  22 +-
 pycorrfit/models/MODEL_TIRF_gaussian_3D2D.py    |  86 ++-
 pycorrfit/models/MODEL_TIRF_gaussian_3D3D.py    |  68 +--
 pycorrfit/models/MODEL_classic_gaussian_2D.py   |  42 +-
 pycorrfit/models/MODEL_classic_gaussian_3D.py   |  79 ++-
 pycorrfit/models/MODEL_classic_gaussian_3D2D.py |  44 +-
 pycorrfit/models/__init__.py                    | 253 ++++----
 pycorrfit/openfile.py                           |  32 +-
 pycorrfit/page.py                               |  67 +--
 pycorrfit/plotting.py                           |  65 +--
 pycorrfit/readfiles/__init__.py                 |  24 +-
 pycorrfit/readfiles/read_ASC_ALV.py             |  58 +-
 pycorrfit/readfiles/read_CSV_PyCorrFit.py       |  21 +-
 pycorrfit/readfiles/read_FCS_Confocor3.py       |  85 +--
 pycorrfit/readfiles/read_SIN_correlator_com.py  |  18 +-
 pycorrfit/readfiles/read_mat_ries.py            |  62 +-
 pycorrfit/readfiles/read_pt3_PicoQuant.py       |  36 +-
 pycorrfit/tools/__init__.py                     |  73 +--
 pycorrfit/tools/average.py                      |  40 +-
 pycorrfit/tools/background.py                   |  39 +-
 pycorrfit/tools/batchcontrol.py                 |  32 +-
 pycorrfit/tools/chooseimport.py                 |  33 +-
 pycorrfit/tools/comment.py                      |  30 +-
 pycorrfit/tools/datarange.py                    |  30 +-
 pycorrfit/tools/example.py                      |  38 +-
 pycorrfit/tools/globalfit.py                    |  39 +-
 pycorrfit/tools/info.py                         |  32 +-
 pycorrfit/tools/overlaycurves.py                |  35 +-
 pycorrfit/tools/parmrange.py                    |  44 +-
 pycorrfit/tools/plotexport.py                   |  32 +-
 pycorrfit/tools/simulation.py                   |  48 +-
 pycorrfit/tools/statistics.py                   |  52 +-
 pycorrfit/tools/trace.py                        |  30 +-
 pycorrfit/usermodel.py                          |  60 +-
 setup.py                                        | 112 ++--
 57 files changed, 1173 insertions(+), 2527 deletions(-)

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