[jumpnbump] 03/03: Merge tag 'upstream/1.60'

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository jumpnbump.

commit f5729c96db8ad80ac6e06cc5d5dfaa7fd9b63b15
Merge: 70a3946 dd386fc
Author: Fabian Greffrath <fabian at debian.org>
Date:   Sat Jun 24 14:54:15 2017 +0200

    Merge tag 'upstream/1.60'
    
    Upstream version 1.60

 .gitignore                                         |   20 +
 AUTHORS                                            |   20 +-
 COPYING                                            |    4 +-
 ChangeLog                                          |   28 +-
 LINKS                                              |    8 -
 Makefile                                           |  103 +-
 PB/.DS_Store                                       |  Bin 6148 -> 0 bytes
 PB/English.lproj/InfoPlist.strings                 |  Bin 480 -> 0 bytes
 PB/JumpNBump.pbproj/.DS_Store                      |  Bin 6148 -> 0 bytes
 PB/JumpNBump.pbproj/ben.pbxuser                    | 1146 --------------------
 PB/JumpNBump.pbproj/project.pbxproj                |  671 ------------
 PB/SDLMain.h                                       |   37 -
 PB/SDLMain.m                                       |  223 ----
 README                                             |   62 --
 README.md                                          |   64 ++
 TODO                                               |    5 -
 VisualC6/gobpack/gobpack.dsp                       |  100 --
 VisualC6/jumpnbump.dsp                             |  235 ----
 VisualC6/jumpnbump.dsw                             |   71 --
 VisualC6/pack/pack.dsp                             |  102 --
 VisualC6/resource.h                                |   16 -
 VisualC6/ressource.rc                              |   72 --
 VisualC6/unpack/unpack.dsp                         |  102 --
 XF86Config-4                                       |  118 --
 build-mingw.sh                                     |   56 +
 config.h                                           |    8 +-
 data/Makefile                                      |   34 +-
 data/level.pcx                                     |  Bin 36203 -> 34279 bytes
 dist/jumpnbump-menu.desktop                        |    9 +
 jumpnbump.6 => dist/jumpnbump.6                    |   22 +-
 dist/jumpnbump.appdata.xml                         |   51 +
 dist/jumpnbump.desktop                             |    9 +
 jumpnbump.ico => dist/jumpnbump.ico                |  Bin
 dist/jumpnbump.png                                 |  Bin 0 -> 2819 bytes
 dist/screenshot.png                                |  Bin 0 -> 68263 bytes
 dj.h                                               |    8 +-
 docs/LINKS                                         |    6 +
 gob.txt => docs/gob.txt                            |    0
 docs/jumpnbump.html                                |  167 +++
 .../levelmaking}/jumpnbump_levelmaking.htm         |    0
 docs/levelmaking/level.pcx                         |  Bin 0 -> 10902 bytes
 {levelmaking => docs/levelmaking}/making1.gif      |  Bin
 {levelmaking => docs/levelmaking}/making2.gif      |  Bin
 {levelmaking => docs/levelmaking}/making3.gif      |  Bin
 {levelmaking => docs/levelmaking}/pack.gif         |  Bin
 readme.txt => docs/original_readme.txt             |    2 +-
 source.txt => docs/source_release.txt              |    0
 dos/gfx.S                                          |  271 -----
 dos/gfx.c                                          |  473 --------
 dos/input.c                                        |  275 -----
 dos/interrpt.c                                     |  147 ---
 filter.c                                           |   13 +-
 filter.h                                           |   10 +-
 fireworks.c                                        |  249 -----
 globals.pre                                        |   68 +-
 indent.txt                                         |    1 -
 jnbmenu.pre                                        |  228 ----
 jumpnbump.fbcon                                    |    4 -
 jumpnbump.html                                     |  158 ---
 jumpnbump.svgalib                                  |    4 -
 levelmaking/level.pcx                              |  Bin 12837 -> 0 bytes
 main.c                                             | 1015 +++--------------
 menu.c                                             |   56 +-
 menu/Makefile                                      |   32 +
 menu/README.md                                     |   31 +
 menu/jumpnbump_menu.glade                          |  850 +++++++++++++++
 menu/jumpnbump_menu.py.pre                         |  252 +++++
 menu/po/Makefile                                   |   24 +
 menu/po/fr.po                                      |  140 +++
 menu/po/jumpnbump-menu.pot                         |  134 +++
 modify/Makefile                                    |   29 +-
 modify/jnbpack.c                                   |   10 +-
 modify/jnbunpack.c                                 |   18 +-
 network.c                                          |  703 ++++++++++++
 network.h                                          |  127 +++
 readme-win32.txt                                   |    7 -
 sdl/Makefile                                       |   10 +-
 sdl/gfx.c                                          |   72 +-
 sdl/input.c                                        |    8 +-
 sdl/interrpt.c                                     |  477 ++------
 sdl/sound.c                                        |   45 +-
 81 files changed, 3271 insertions(+), 6249 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/jumpnbump.git