[yorick] 01/02: Merge tag 'upstream/2.2.04+dfsg'

[Thibaut Jean-Claude Paumard]

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

thibaut pushed a commit to branch master
in repository yorick.

commit d28b769087021e44aca5798e6b595912742eeb6f
Merge: 7a49880 750371a
Author: Thibaut Paumard <thibaut at debian.org>
Date:   Mon May 18 11:54:02 2015 +0200

    Merge tag 'upstream/2.2.04+dfsg'

 Makepkg              |    5 +-
 VERSION              |    2 +-
 gist/gread.c         |    5 +-
 hex/hex.c            |   10 +-
 hex/hex.i            |   10 +-
 hex/hydram.c         |    4 +-
 hex/store.c          |   50 +--
 i-start/50i.i        |    2 +-
 i/fits.i             | 1126 +++++++++++++++++++++++++++++++++++++-------------
 i/levmar.i           |   61 ++-
 i/testsock.i         |  120 ++++++
 i0/graph.i           |  129 +++++-
 i0/std.i             |  191 ++++++++-
 mpy/mpy.c            |   50 ++-
 mpy/mpy.i            |   41 +-
 play/any/Makefile    |    5 +-
 play/any/psoftfpe.c  |   65 +++
 play/play.h          |   53 ++-
 play/pstdio.h        |    1 +
 play/unix/Makefile   |    4 +-
 play/unix/config.c   |   39 ++
 play/unix/config.sh  |   32 ++
 play/unix/files.c    |   14 +
 play/unix/fpuset.c   |   16 +-
 play/unix/slinks.c   |   26 +-
 play/unix/umain.c    |    1 +
 play/unix/usock.c    |  334 +++++++++++++++
 play/win/files.c     |   25 +-
 play/win/handler.c   |    8 +-
 play/win/mfcapp.cpp  |   24 +-
 play/win/mfcterm.cpp |   75 ++--
 play/win/playw.h     |    1 +
 play/win/sigseh.c    |    4 +-
 play/win/wpoll.c     |   42 +-
 play/win/wsock.c     |  499 ++++++++++++++++++++++
 play/x11/fonts.c     |    1 -
 play/yversion.h      |    2 +-
 win/.gitignore       |    5 +
 win/bench.dsp        |  425 -------------------
 win/bench.vcxproj    |  353 ++++++++++++++++
 win/browser.dsp      |  156 -------
 win/browser.rc       |  818 ++++++++++++++++++------------------
 win/browser.vcxproj  |  306 ++++++++++++++
 win/codger.dsp       |   93 -----
 win/codger.vcxproj   |  251 +++++++++++
 win/drat.dsp         |  128 ------
 win/drat.vcxproj     |  247 +++++++++++
 win/gist.dsp         |  192 ---------
 win/gist.vcxproj     |  263 ++++++++++++
 win/hex.dsp          |  140 -------
 win/hex.vcxproj      |  250 +++++++++++
 win/makeinit.bat     |   22 +-
 win/numfmt.dsp       |   94 -----
 win/numfmt.h         |   28 --
 win/numfmt.vcxproj   |  249 +++++++++++
 win/pkg.dsp          |   92 -----
 win/play.dsp         |  284 -------------
 win/play.vcxproj     |  288 +++++++++++++
 win/setup.dsp        |  154 -------
 win/setup.vcxproj    |  155 +++++++
 win/test2d.dsp       |  144 -------
 win/test2d.vcxproj   |  299 ++++++++++++++
 win/test3d.dsp       |  149 -------
 win/test3d.vcxproj   |  304 ++++++++++++++
 win/yflat.dsp        |  898 ----------------------------------------
 win/yflat.vcxproj    |  512 +++++++++++++++++++++++
 win/yorick.dsp       |  140 -------
 win/yorick.dsw       |  230 -----------
 win/yorick.rc        |  880 +++++++++++++++++++--------------------
 win/yorick.sln       |  216 ++++++++++
 win/yorick.vcxproj   |  316 ++++++++++++++
 win/yorlib.dsp       |  493 ----------------------
 win/yorlib.vcxproj   |  390 +++++++++++++++++
 yorick/Makefile      |   17 +-
 yorick/ascio.c       |   38 +-
 yorick/clog.c        |   10 +-
 yorick/codger.c      |    6 +-
 yorick/fnctn.c       |    7 +
 yorick/fortrn.c      |    3 +-
 yorick/funcdef.c     |    6 +
 yorick/fwrap.c       |    3 +-
 yorick/graph.c       |    4 +-
 yorick/ops.c         |    4 +
 yorick/ops3.c        |    4 +
 yorick/socky.c       |  285 +++++++++++++
 yorick/std2.c        |   79 ++++
 yorick/task.c        |   74 +++-
 yorick/yapi.h        |   12 +-
 yorick/yconfig.sh    |    4 +-
 yorick/yinput.c      |   19 +-
 yorick/yio.c         |   56 ++-
 yorick/yorick.c      |   14 +-
 92 files changed, 8472 insertions(+), 5214 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yorick.git