[med-svn] [praat] 02/03: Merge tag 'upstream/5.3.57+dfsg'

[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 bbe9265b07908c3d0c3a3929c778f1856d86eca1
Merge: 06d653e c21c4f0
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Mon Oct 28 13:02:47 2013 +0100

    Merge tag 'upstream/5.3.57+dfsg'
    
    Upstream version 5.3.57+dfsg

 fon/Makefile                          |    6 +-
 fon/Matrix.cpp                        |    2 +-
 fon/Matrix.h                          |    6 +-
 fon/Matrix_def.h                      |   14 +-
 fon/Photo.cpp                         |  314 ++++++++++++++++++++++++++++++++
 fon/Photo.h                           |   81 +++++++++
 fon/{Matrix_def.h => Photo_def.h}     |   71 +++++---
 fon/Sampled.h                         |    2 -
 fon/SampledXY.cpp                     |   64 +++++++
 fon/SampledXY.h                       |   62 +++++++
 fon/{Matrix_def.h => SampledXY_def.h} |   42 ++---
 fon/manual_tutorials.cpp              |    5 +-
 fon/praat_Fon.cpp                     |  319 ++++++++++++++++++++++++++++++++-
 main/praat_mac.plist                  |   38 +++-
 makefiles/makefile.defs.linux.alsa    |    4 +-
 makefiles/makefile.defs.linux.silent  |    4 +-
 num/NUM.h                             |    6 +-
 praat64_xcodeproj.dmg                 |  Bin 300908 -> 0 bytes
 praat_xcodeproj.dmg                   |  Bin 355256 -> 0 bytes
 sys/Formula.cpp                       |    5 -
 sys/Graphics.h                        |    4 +
 sys/GraphicsP.h                       |    4 +-
 sys/GraphicsScreen.cpp                |    1 +
 sys/Graphics_image.cpp                |  138 ++++++++++----
 sys/Graphics_record.cpp               |   34 +++-
 sys/GuiThing.cpp                      |    5 +
 sys/melder.h                          |    2 +
 sys/melder_audio.cpp                  |   77 ++++----
 sys/oo_DESCRIPTION.h                  |    3 +
 sys/oo_DESTROY.h                      |    2 +-
 sys/oo_READ_BINARY.h                  |   12 +-
 sys/oo_READ_TEXT.h                    |   12 +-
 sys/oo_WRITE_BINARY.h                 |   16 +-
 sys/oo_WRITE_TEXT.h                   |   15 +-
 sys/praat_version.h                   |    8 +-
 35 files changed, 1202 insertions(+), 176 deletions(-)

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