[med-svn] [praat] branch master updated (b638635 -> 9fa971b)

[Rafael Laboissière]

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

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

      from  b638635   Upload to unstable
      adds  59e321e   Imported Upstream version 5.4.0
       new  088793c   Merge tag 'upstream/5.4.0'
       new  c96f852   Update upstream changelog
       new  081cdfc   Prepare d/changelog for version 5.4.0-1
       new  fbb2ce7   Merge branch 'master' of git+ssh://anonscm.debian.org/git/debian-med/praat
       new  9fa971b   Fix wrong merge

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 EEG/ERPWindow.cpp               |    4 +-
 artsynth/manual_Artsynth.cpp    |   22 +-
 debian/What_s_new_.html         | 1014 ++++++++---------
 debian/changelog                |    8 +-
 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 +-
 26 files changed, 2234 insertions(+), 2214 deletions(-)

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