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

[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 f0a9acfcce65f44eac1e8a7d81e60cda0c9e46fa
Merge: 9f1c8f7 8f11966
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sat Mar 14 17:33:25 2015 -0300

    Merge tag 'upstream/5.4.6'
    
    Upstream version 5.4.6

 dwtools/LongSound_extensions.cpp |   3 +-
 dwtools/Sound_extensions.cpp     |  14 +-
 external/espeak/speech.h         |   2 +-
 external/flac/flac_share_alloc.h |   2 +
 external/mp3/mp3.cpp             |   4 +
 fon/Matrix.cpp                   |   6 +-
 fon/Pitch.cpp                    |   2 +-
 fon/Praat_tests.cpp              |  34 +-
 fon/Praat_tests_enums.h          |   8 +-
 fon/Sampled_def.h                |   2 +-
 fon/Sound_files.cpp              |  41 +--
 fon/TimeSoundAnalysisEditor.cpp  |  50 +--
 fon/WordList.cpp                 |  12 +-
 fon/manual_tutorials.cpp         |   7 +-
 fon/praat_Sound_init.cpp         |   2 +-
 main/main_Praat.cpp              |  11 +-
 sys/Collection.cpp               |  58 ++--
 sys/Graphics.cpp                 |   2 +
 sys/GraphicsScreen.cpp           |   2 +-
 sys/Graphics_enums.h             |  13 +-
 sys/Graphics_record.cpp          |   8 +-
 sys/Graphics_text.cpp            |  43 ++-
 sys/GuiList.cpp                  |   6 +-
 sys/GuiMenu.cpp                  |   2 +-
 sys/GuiText.cpp                  |  16 +-
 sys/TextEditor.cpp               |   4 +-
 sys/abcio.cpp                    | 680 +++++++++++++++++++++------------------
 sys/abcio.h                      |  28 +-
 sys/melder.cpp                   |   2 +-
 sys/melder.h                     | 417 ++++++++++++++----------
 sys/melder_alloc.cpp             |  97 ++++--
 sys/melder_audiofiles.cpp        | 459 ++++++++++++++++----------
 sys/melder_debug.cpp             |  20 +-
 sys/melder_files.cpp             |  32 +-
 sys/melder_ftoa.cpp              |  38 ++-
 sys/melder_readtext.cpp          |  86 ++---
 sys/melder_strings.cpp           | 208 ++++++------
 sys/melder_textencoding.cpp      | 350 ++++++++++++--------
 sys/melder_writetext.cpp         | 262 +++++++--------
 sys/oo.h                         |   9 +-
 sys/oo_DESCRIPTION.h             |   4 +-
 sys/oo_READ_BINARY.h             |   4 +-
 sys/praat.cpp                    |  10 +
 sys/praat_logo.cpp               |   6 +-
 sys/praat_objectMenus.cpp        |   2 +-
 sys/praat_version.h              |  10 +-
 test/fon/data.praat              | Bin 6455 -> 13426 bytes
 test/fon/soundFiles.praat        |   9 +
 test/runAllTests.praat           |  33 +-
 49 files changed, 1827 insertions(+), 1293 deletions(-)

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