[med-svn] [praat] 01/05: Merge tag 'upstream/5.4.0'

[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 088793c0ca1346a3e2d44061a94846da23b57b7b
Merge: a21e1bf 59e321e
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Oct 5 17:54:55 2014 -0300

    Merge tag 'upstream/5.4.0'
    
    Upstream version 5.4.0

 EEG/ERPWindow.cpp               |    4 +-
 artsynth/manual_Artsynth.cpp    |   22 +-
 fon/TextGridEditor.cpp          |    2 +-
 fon/TimeSoundAnalysisEditor.cpp |    2 +-
 fon/manual_Fon.cpp              |  327 +++---
 fon/manual_Script.cpp           |    8 +-
 fon/manual_annotation.cpp       |    2 +-
 fon/manual_formant.cpp          |   48 +-
 fon/manual_glossary.cpp         |   88 +-
 fon/manual_soundFiles.cpp       |  138 +--
 fon/manual_spectrum.cpp         |  166 +--
 fon/manual_tutorials.cpp        | 2365 ++++++++++++++++++++-------------------
 gram/OTGrammar.cpp              |    2 +-
 gram/OTGrammarEditor.cpp        |    4 +-
 gram/OTMultiEditor.cpp          |    4 +-
 gram/manual_gram.cpp            |  130 ++-
 main/main_Praat.cpp             |    4 +-
 stat/manual_statistics.cpp      |   63 +-
 sys/Graphics.cpp                |    4 +
 sys/Graphics_enums.h            |   10 +-
 sys/GuiFileSelect.cpp           |   13 +-
 sys/ManPagesM.h                 |    8 +-
 sys/Manual.cpp                  |    4 +-
 sys/praat_version.h             |    8 +-
 24 files changed, 1715 insertions(+), 1711 deletions(-)

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