[med-svn] [praat] 02/03: Merge tag 'upstream/6.0.26'

[Rafael Laboissiere]

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

rafael pushed a commit to branch master
in repository praat.

commit 1acbcf6c595e591f8112a873d4a46dc93c3e4208
Merge: a84a1c2 9e679d8
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri Mar 3 12:21:22 2017 -0300

    Merge tag 'upstream/6.0.26'
    
    Upstream version 6.0.26

 dwsys/regularExp.cpp                          | 12 ++--
 dwtools/CC.cpp                                | 17 ++++-
 dwtools/MFCC.cpp                              |  6 ++
 dwtools/MFCC.h                                |  2 +
 dwtools/manual_dwtools.cpp                    | 12 ++--
 fon/FunctionEditor.cpp                        | 20 +++++-
 fon/FunctionEditor.h                          |  3 +-
 fon/RunnerMFC.cpp                             | 51 ++++++++-------
 fon/RunnerMFC.h                               |  3 +-
 fon/SoundRecorder.cpp                         |  2 +-
 fon/TextGridEditor.cpp                        | 91 +++++++++++++++++++++++++++
 fon/TextGridEditor.h                          |  6 +-
 fon/manual_Script.cpp                         |  6 +-
 fon/manual_tutorials.cpp                      | 40 ++++++++----
 fon/praat_TextGrid_init.cpp                   |  6 +-
 kar/longchar.cpp                              | 10 +--
 kar/longchar.h                                |  4 +-
 makefiles/makefile.defs.mingw32               |  4 +-
 makefiles/makefile.defs.mingw64               |  4 +-
 sys/DemoEditor.cpp                            | 11 ----
 sys/Formula.cpp                               | 30 ++++++++-
 sys/GraphicsScreen.cpp                        | 29 +++------
 sys/GuiShell.cpp                              |  4 +-
 sys/InfoEditor.cpp                            | 21 +++++--
 sys/ManPages.cpp                              | 38 +++++------
 sys/Manual.cpp                                |  8 +--
 sys/Ui.cpp                                    | 16 ++---
 sys/melder.h                                  |  5 ++
 sys/melder_sysenv.cpp                         | 40 ++++++++++--
 sys/praat.cpp                                 | 17 ++++-
 sys/praat_logo.cpp                            |  4 +-
 sys/praat_version.h                           | 10 +--
 test/fon ExperimentMFC/simplest.ExperimentMFC |  2 +-
 test/fon/resample16_8.praat                   | 48 ++++++++++++++
 test/fon/resample22_8.praat                   | 59 +++++++++++++++++
 test/fon/resample44_8.praat                   | 60 ++++++++++++++++++
 36 files changed, 540 insertions(+), 161 deletions(-)

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