This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository rocksndiamonds.
commit d70bad85b2e0519d6a871c255e76b8706a3def56 Merge: 16c0b47 a6b374c Author: Stephen Kitt <[email protected]> Date: Tue Jan 17 12:52:44 2017 +0100 Merge tag 'upstream/4.0.0.1+dfsg' Upstream version 4.0.0.1+dfsg ChangeLog | 673 ++- INSTALL | 98 +- Makefile | 112 +- README | 340 -- build-scripts/create_element_defs.pl | 2645 +++++++++ docs/elements/amoeba_dry.txt | 12 +- docs/elements/amoeba_full.txt | 8 +- docs/elements/amoeba_wet.txt | 10 +- docs/elements/bd_amoeba.txt | 14 +- docs/elements/bd_butterfly.txt | 12 +- docs/elements/bd_firefly.txt | 8 +- docs/elements/bd_magic_wall.txt | 14 +- docs/elements/bd_wall.txt | 12 +- docs/elements/bug.txt | 10 +- docs/elements/char_space.txt | 8 +- docs/elements/custom.txt | 12 +- docs/elements/dc_magic_wall.txt | 16 +- docs/elements/dynabomb_increase_number.txt | 16 +- docs/elements/dynabomb_increase_power.txt | 16 +- docs/elements/dynabomb_increase_size.txt | 14 +- docs/elements/em_gate_1_gray.txt | 14 +- docs/elements/em_gate_2_gray.txt | 14 +- docs/elements/em_gate_3_gray.txt | 14 +- docs/elements/em_gate_4_gray.txt | 14 +- docs/elements/emc_gate_5_gray.txt | 14 +- docs/elements/emc_gate_6_gray.txt | 14 +- docs/elements/emc_gate_7_gray.txt | 14 +- docs/elements/emc_gate_8_gray.txt | 14 +- docs/elements/empty_space.txt | 6 +- docs/elements/expandable_wall.txt | 12 +- docs/elements/game_of_life.txt | 18 +- docs/elements/invisible_sand.txt | 6 +- docs/elements/invisible_steelwall.txt | 8 +- docs/elements/invisible_wall.txt | 6 +- docs/elements/magic_wall.txt | 16 +- docs/elements/robot_wheel.txt | 14 +- docs/elements/satellite.txt | 12 +- docs/elements/shield_deadly.txt | 14 +- docs/elements/sokoban_field_empty.txt | 12 +- docs/elements/sokoban_field_full.txt | 12 +- docs/elements/sokoban_field_player.txt | 10 +- docs/elements/sp_base.txt | 6 +- docs/elements/spaceship.txt | 8 +- docs/elements/switchgate_switch.txt | 4 +- docs/elements/timegate_switch.txt | 4 +- docs/elements/yamyam.txt | 16 +- rocksndiamonds.1 | 245 - src/Makefile | 184 +- src/anim.c | 1265 +++++ src/anim.h | 21 + src/cartoons.c | 95 - src/cartoons.h | 19 - src/conf_act.c | 22 +- src/conf_chr.c | 322 +- src/conf_chr.h | 22 +- src/conf_cus.c | 1046 ++-- src/conf_cus.h | 22 +- src/conf_e2g.c | 22 +- src/conf_e2s.c | 22 +- src/conf_esg.c | 22 +- src/conf_fnt.c | 54 +- src/conf_g2m.c | 26 +- src/conf_g2s.c | 26 +- src/conf_gfx.c | 3563 ++++++++---- src/conf_gfx.h | 499 +- src/conf_grp.c | 150 +- src/conf_grp.h | 22 +- src/conf_hlp.c | 22 +- src/conf_mus.c | 23 +- src/conf_mus.h | 73 +- src/conf_snd.c | 56 +- src/conf_snd.h | 89 +- src/conf_var.c | 8372 +++++++++++++++++++--------- src/config.c | 116 +- src/config.h | 27 +- src/conftime.h | 1 + src/editor.c | 3266 ++++++----- src/editor.h | 22 +- src/engines.h | 37 +- src/events.c | 1536 +++-- src/events.h | 34 +- src/files.c | 2812 ++++------ src/files.h | 26 +- src/game.c | 4025 ++++--------- src/game.h | 136 +- src/game_em/Makefile | 12 +- src/game_em/cave.c | 24 +- src/game_em/convert.c | 130 +- src/game_em/export.h | 14 +- src/game_em/game_em.h | 22 +- src/game_em/global.h | 11 +- src/game_em/graphics.c | 575 +- src/game_em/init.c | 298 +- src/game_em/input.c | 66 +- src/game_em/level.h | 6 - src/game_em/main_em.h | 57 +- src/game_em/sample.h | 12 +- src/game_em/sound.c | 511 -- src/game_em/synchro_1.c | 218 +- src/game_em/synchro_2.c | 107 +- src/game_em/synchro_3.c | 18 - src/game_em/tab_generate.c | 76 +- src/game_em/ulaw_generate.c | 129 - src/game_sp/BugsTerminals.c | 6 +- src/game_sp/BugsTerminals.h | 4 - src/game_sp/DDScrollBuffer.c | 181 +- src/game_sp/DDScrollBuffer.h | 16 +- src/game_sp/DDSpriteBuffer.c | 10 +- src/game_sp/Display.c | 6 +- src/game_sp/Display.h | 6 +- src/game_sp/DoGameStuff.c | 18 +- src/game_sp/DoGameStuff.h | 5 - src/game_sp/Explosions.c | 28 +- src/game_sp/Globals.c | 52 +- src/game_sp/Globals.h | 23 +- src/game_sp/Infotrons.c | 11 - src/game_sp/MainForm.c | 45 +- src/game_sp/MainGameLoop.c | 24 - src/game_sp/Makefile | 16 +- src/game_sp/Murphy.c | 185 +- src/game_sp/SnikSnaks.c | 2 - src/game_sp/Zonk.c | 4 - src/game_sp/export.h | 28 +- src/game_sp/file.c | 126 +- src/game_sp/game_sp.h | 22 +- src/game_sp/init.c | 193 +- src/game_sp/main.c | 22 +- src/game_sp/main_sp.h | 41 +- src/game_sp/vb_lib.c | 16 +- src/game_sp/vb_lib.h | 6 +- src/init.c | 1860 +++--- src/init.h | 27 +- src/libgame/Makefile | 17 +- src/libgame/android.h | 18 + src/libgame/gadgets.c | 229 +- src/libgame/gadgets.h | 94 +- src/libgame/hash.c | 22 +- src/libgame/hash.h | 22 +- src/libgame/image.c | 1006 +--- src/libgame/image.h | 107 +- src/libgame/joystick.c | 109 +- src/libgame/joystick.h | 29 +- src/libgame/libgame.h | 24 +- src/libgame/macosx.h | 28 +- src/libgame/misc.c | 1837 ++++-- src/libgame/misc.h | 180 +- src/libgame/msdos.c | 1002 ---- src/libgame/msdos.h | 760 --- src/libgame/pcx.c | 316 -- src/libgame/pcx.h | 37 - src/libgame/platform.h | 46 +- src/libgame/random.c | 44 +- src/libgame/random.h | 24 +- src/libgame/sdl.c | 1619 ++++-- src/libgame/sdl.h | 182 +- src/libgame/setup.c | 978 ++-- src/libgame/setup.h | 40 +- src/libgame/snapshot.c | 255 +- src/libgame/snapshot.h | 43 +- src/libgame/sound.c | 1388 +---- src/libgame/sound.h | 57 +- src/libgame/system.c | 1095 ++-- src/libgame/system.h | 517 +- src/libgame/text.c | 456 +- src/libgame/text.h | 66 +- src/libgame/toons.c | 425 -- src/libgame/toons.h | 64 - src/libgame/types.h | 23 +- src/libgame/windows.h | 22 +- src/libgame/x11.c | 526 -- src/libgame/x11.h | 356 -- src/main.c | 357 +- src/main.h | 665 ++- src/netserv.c | 202 +- src/netserv.h | 25 +- src/network.c | 183 +- src/network.h | 22 +- src/screens.c | 3695 +++++++----- src/screens.h | 29 +- src/tape.c | 1018 ++-- src/tape.h | 180 +- src/tools.c | 5320 +++++++++--------- src/tools.h | 96 +- 183 files changed, 33077 insertions(+), 30735 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
