[med-svn] [praat] 13/14: Merge tag 'upstream/6.0.4'

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository praat.

commit 6d8eb43ae2c183bad626d9d60878e5d57fc3eecc
Merge: 33b9f37 5bde0af
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Nov 1 13:52:12 2015 -0200

    Merge tag 'upstream/6.0.4'
    
    Upstream version 6.0.4

 .gitignore                                |   5 +
 FFNet/FFNet_Activation_Categories.cpp     |   4 +-
 FFNet/FFNet_def.h                         |   3 +-
 artsynth/praat_Artsynth.cpp               |  34 +--
 contrib/ola/praat_contrib_Ola_KNN.cpp     |  92 +++---
 dwtools/CCA.cpp                           |  45 ++-
 dwtools/CCA.h                             |  15 +-
 dwtools/CCA_and_Correlation.cpp           |   4 +-
 dwtools/CCA_and_Correlation.h             |   4 +-
 dwtools/CCA_def.h                         |  10 +-
 dwtools/CCs_to_DTW.cpp                    |   4 +-
 dwtools/CCs_to_DTW.h                      |   4 +-
 dwtools/ClassificationTable.cpp           |  22 +-
 dwtools/ClassificationTable.h             |  13 +-
 dwtools/Configuration_AffineTransform.cpp |   8 +-
 dwtools/Configuration_AffineTransform.h   |   4 +-
 dwtools/Configuration_and_Procrustes.cpp  |   6 +-
 dwtools/Configuration_and_Procrustes.h    |   4 +-
 dwtools/DataModeler_def.h                 |   2 +-
 dwtools/Discriminant.cpp                  |   6 +-
 dwtools/Discriminant.h                    |   2 +-
 dwtools/KlattGrid.cpp                     |   9 +-
 dwtools/OptimalCeilingTier.cpp            |   1 -
 dwtools/SPINET.cpp                        |   7 +-
 dwtools/SPINET.h                          |   4 +-
 dwtools/SPINET_to_Pitch.cpp               |   4 +-
 dwtools/SPINET_to_Pitch.h                 |   5 +-
 dwtools/SSCP.cpp                          |  21 +-
 dwtools/SSCP.h                            |   6 +-
 dwtools/Sound_to_Pitch2.cpp               |  18 +-
 dwtools/Sound_to_Pitch2.h                 |   6 +-
 dwtools/Sound_to_SPINET.cpp               |  14 +-
 dwtools/Sound_to_SPINET.h                 |   4 +-
 dwtools/Sounds_to_DTW.cpp                 |   6 +-
 dwtools/Sounds_to_DTW.h                   |   4 +-
 dwtools/Spectrogram_extensions.cpp        |  44 ++-
 dwtools/Spectrogram_extensions.h          |  26 +-
 dwtools/Strings_extensions.cpp            |  57 ++--
 dwtools/Strings_extensions.h              |  38 +--
 dwtools/praat_BSS_init.cpp                |  72 ++---
 dwtools/praat_DataModeler_init.cpp        |  32 +-
 dwtools/praat_David_init.cpp              | 466 ++++++++++++++++--------------
 dwtools/praat_MDS_init.cpp                |  12 +-
 fon/manual_Script.cpp                     |  51 ++--
 fon/manual_tutorials.cpp                  |   5 +-
 fon/praat_Fon.cpp                         |   5 +-
 sys/Collection.cpp                        |   2 +-
 sys/Collection.h                          |   4 +-
 sys/Data.cpp                              |  20 +-
 sys/Data.h                                |   3 +-
 sys/DataEditor.cpp                        |  11 +-
 sys/oo.h                                  |   1 +
 sys/oo_CAN_WRITE_AS_ENCODING.h            |   3 +
 sys/oo_COPY.h                             |   3 +
 sys/oo_DESCRIPTION.h                      |   1 +
 sys/oo_DESTROY.h                          |   2 +
 sys/oo_EQUAL.h                            |   3 +
 sys/oo_READ_BINARY.h                      |  11 +
 sys/oo_READ_TEXT.h                        |  11 +
 sys/oo_WRITE_BINARY.h                     |   9 +
 sys/oo_WRITE_TEXT.h                       |  11 +
 sys/oo_undef.h                            |   1 +
 sys/praat.cpp                             |  42 +--
 sys/praat.h                               |  36 +--
 sys/praat_statistics.cpp                  |  26 +-
 sys/praat_version.h                       |   8 +-
 66 files changed, 767 insertions(+), 649 deletions(-)

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