[med-svn] [praat] 02/10: Merge tag 'upstream/6.0.17'

[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 7a9710391dc34503750dbf9d54310abf4d04e5ed
Merge: dcb94e0 8932ae1
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Fri May 6 10:08:04 2016 -0300

    Merge tag 'upstream/6.0.17'
    
    Upstream version 6.0.17

 FFNet/FFNet.cpp                            |   2 +-
 LPC/manual_LPC.cpp                         |   6 +-
 dwtools/CC.cpp                             |  13 +-
 dwtools/DTW.cpp                            | 274 +++++++++++++++++------------
 dwtools/DTW.h                              |   6 +-
 dwtools/DTW_and_TextGrid.cpp               |   6 +-
 dwtools/DTW_def.h                          |  19 +-
 dwtools/Sound_extensions.cpp               |   6 +-
 dwtools/Spectrogram_extensions.cpp         |   2 +-
 dwtools/SpeechSynthesizer.cpp              | 191 +++++++++++++++-----
 dwtools/SpeechSynthesizer_and_TextGrid.cpp |  49 +++---
 dwtools/manual_dwtools.cpp                 |   8 +-
 dwtools/praat_David_init.cpp               | 100 +++++++----
 fon/Pitch_Intensity.cpp                    |  15 ++
 fon/Pitch_Intensity.h                      |   2 +
 fon/TextGrid_Sound.cpp                     |  55 +++---
 fon/TextGrid_def.h                         |   7 +
 fon/manual_Script.cpp                      |  13 +-
 fon/manual_tutorials.cpp                   |   9 +-
 fon/praat_Fon.cpp                          |  13 ++
 main/GNU_General_Public_License.txt        |   2 +-
 sys/Formula.cpp                            |  20 ++-
 sys/GuiText.cpp                            |   2 +-
 sys/Interpreter.cpp                        |  23 ++-
 sys/abcio.cpp                              |  58 +++---
 sys/praat_version.h                        |   8 +-
 26 files changed, 568 insertions(+), 341 deletions(-)

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