[adonthell] 43/65: Merge tag 'upstream/0.3.6_beta1'

Markus Koschany apo at moszumanska.debian.org
Tue Jul 12 19:53:57 UTC 2016


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

apo pushed a commit to branch master
in repository adonthell.

commit 8234edcf03e7dd3932494b487b72b0968fa57ac3
Merge: 788847c 1c2ccab
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jul 12 11:29:19 2016 +0200

    Merge tag 'upstream/0.3.6_beta1'
    
    Upstream version 0.3.6~beta1
    
    # gpg: Signature made Tue 12 Jul 2016 11:29:08 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 ABOUT-NLS                               |  2260 +--
 AUTHORS                                 |    11 +-
 COPYING                                 |     0
 FULLSCREEN.howto                        |   100 -
 INSTALL                                 |    76 +-
 Makefile.am                             |     6 +-
 Makefile.in                             |   557 +-
 NEWBIE                                  |   146 +-
 NEWS                                    |    12 +-
 README                                  |   116 +-
 README.BeOS                             |   106 -
 README.FreeBSD                          |    66 -
 README.MacOSX                           |    73 +-
 README.Solaris                          |    70 -
 aclocal.m4                              |  8001 ++-------
 adonthell.spec                          |     2 +-
 autogen.sh                              |     7 -
 compile                                 |   347 +
 config.guess                            |   598 +-
 config.h.in                             |    36 +-
 config.rpath                            |   230 +-
 config.sub                              |   377 +-
 configure                               | 26996 +++++++-----------------------
 configure.in                            |   466 +-
 depcomp                                 |   601 +-
 doc/Makefile.in                         |   419 +-
 doc/devel/Makefile.in                   |   190 +-
 doc/dlgedit-api/Makefile.in             |   190 +-
 doc/dlgedit/Makefile.in                 |   190 +-
 doc/items/Makefile.in                   |   190 +-
 install-sh                              |   258 +-
 ltmain.sh                               |  6938 --------
 m4/Makefile.in                          |   190 +-
 m4/gettext.m4                           |   142 +-
 m4/iconv.m4                             |   226 +-
 m4/lib-ld.m4                            |    87 +-
 m4/lib-link.m4                          |   311 +-
 m4/lib-prefix.m4                        |    91 +-
 m4/nls.m4                               |    17 +-
 m4/po.m4                                |    63 +-
 m4/progtest.m4                          |    35 +-
 make_bundle.sh                          |   184 +
 make_windows_pkg.sh                     |   170 +
 missing                                 |   455 +-
 po/Makefile.in.in                       |   130 +-
 po/Makevars                             |    39 +-
 po/Rules-quot                           |    15 +-
 src/Makefile.am                         |   202 +-
 src/Makefile.in                         |   803 +-
 src/achievements.cc                     |   305 +
 src/achievements.h                      |   200 +
 src/adonthell.cc                        |    70 +-
 src/audio.cc                            |     4 +-
 src/audio.h                             |     4 +-
 src/data_screen.cc                      |     4 +-
 src/dialog.cc                           |    42 +-
 src/dialog.h                            |     6 +-
 src/dialog_screen.cc                    |     6 +-
 src/drawable.cc                         |     3 +-
 src/drawing_area.cc                     |    21 +-
 src/event_handler.cc                    |     8 +-
 src/fileops.cc                          |     6 +-
 src/game.cc                             |    60 +-
 src/game.h                              |    19 +-
 src/gamedata.cc                         |    81 +-
 src/gamedata.h                          |     6 +-
 src/gametime.cc                         |     4 +-
 src/gettext.h                           |   247 +-
 src/image.cc                            |   170 +-
 src/image.h                             |     8 +-
 src/input.cc                            |   131 +-
 src/input.h                             |    51 +-
 src/label.cc                            |   134 +-
 src/label.h                             |    24 +-
 src/label_input.cc                      |    62 +-
 src/label_input.h                       |     4 +-
 src/lex.prefs.cc                        |  1741 +-
 src/main.cc                             |    78 +-
 src/mapcharacter.cc                     |     5 +-
 src/mapsquare.h                         |    14 +-
 src/modules/Makefile.am                 |    22 +-
 src/modules/Makefile.in                 |   263 +-
 src/modules/adonthell.py                |  1899 ++-
 src/modules/dialogue.py                 |     8 +-
 src/nls.cc                              |    17 +-
 src/nls.h                               |    10 +-
 src/pnm.cc                              |    10 +-
 src/prefs.cc                            |    62 +-
 src/prefs.h                             |    13 +-
 src/prefs.l                             |     4 +-
 src/py_adonthell.i                      |    14 +-
 src/py_adonthell_wrap.cc                | 16337 +++++++-----------
 src/py_callback.cc                      |     6 +-
 src/py_callback.h                       |     3 +-
 src/py_object.cc                        |     5 +-
 src/python_class.cc                     |    30 +-
 src/python_class.h                      |    31 +-
 src/screen.cc                           |   346 +-
 src/screen.h                            |    96 +-
 src/storage.h                           |     4 +-
 src/str_hash.h                          |    74 +-
 src/surface.cc                          |   932 +-
 src/surface.h                           |   223 +-
 src/tools/Makefile.am                   |     4 +
 {doc => src/tools}/Makefile.in          |   424 +-
 src/tools/dlgedit/Makefile.am           |   101 +
 src/tools/dlgedit/Makefile.in           |  1379 ++
 src/tools/dlgedit/cfg_data.cc           |   158 +
 src/tools/dlgedit/cfg_data.h            |    99 +
 src/tools/dlgedit/cfg_io.cc             |   120 +
 src/tools/dlgedit/cfg_io.h              |    72 +
 src/tools/dlgedit/cfg_project.cc        |    74 +
 src/tools/dlgedit/cfg_project.h         |    87 +
 src/tools/dlgedit/dlg_arrow.cc          |   387 +
 src/tools/dlgedit/dlg_arrow.h           |   136 +
 src/tools/dlgedit/dlg_circle.cc         |   322 +
 src/tools/dlgedit/dlg_circle.h          |   152 +
 src/tools/dlgedit/dlg_circle_entry.cc   |    98 +
 src/tools/dlgedit/dlg_circle_entry.h    |    98 +
 src/tools/dlgedit/dlg_cmdline.cc        |   125 +
 src/tools/dlgedit/dlg_cmdline.h         |    79 +
 src/tools/dlgedit/dlg_compiler.cc       |   784 +
 src/tools/dlgedit/dlg_compiler.h        |   157 +
 src/tools/dlgedit/dlg_module.cc         |   649 +
 src/tools/dlgedit/dlg_module.h          |   395 +
 src/tools/dlgedit/dlg_module_entry.cc   |   230 +
 src/tools/dlgedit/dlg_module_entry.h    |   179 +
 src/tools/dlgedit/dlg_mover.cc          |   145 +
 src/tools/dlgedit/dlg_mover.h           |    73 +
 src/tools/dlgedit/dlg_node.cc           |   193 +
 src/tools/dlgedit/dlg_node.h            |   206 +
 src/tools/dlgedit/dlg_node_gfx.cc       |    37 +
 src/tools/dlgedit/dlg_node_gfx.h        |    95 +
 src/tools/dlgedit/dlg_point.cc          |    46 +
 src/tools/dlgedit/dlg_point.h           |   114 +
 src/tools/dlgedit/dlg_rect.cc           |   144 +
 src/tools/dlgedit/dlg_rect.h            |   198 +
 src/tools/dlgedit/dlg_types.h           |   153 +
 src/tools/dlgedit/gui_circle.cc         |   466 +
 src/tools/dlgedit/gui_circle.h          |    75 +
 src/tools/dlgedit/gui_circle_events.cc  |    75 +
 src/tools/dlgedit/gui_circle_events.h   |    38 +
 src/tools/dlgedit/gui_code.cc           |   190 +
 src/tools/dlgedit/gui_code.h            |    78 +
 src/tools/dlgedit/gui_dlgedit.cc        |   974 ++
 src/tools/dlgedit/gui_dlgedit.h         |   247 +
 src/tools/dlgedit/gui_dlgedit_events.cc |   188 +
 src/tools/dlgedit/gui_dlgedit_events.h  |    52 +
 src/tools/dlgedit/gui_edit.cc           |    77 +
 src/tools/dlgedit/gui_edit.h            |    68 +
 src/tools/dlgedit/gui_error.cc          |   219 +
 src/tools/dlgedit/gui_error.h           |    68 +
 src/tools/dlgedit/gui_file.cc           |   123 +
 src/tools/dlgedit/gui_file.h            |    81 +
 src/tools/dlgedit/gui_graph.cc          |   888 +
 src/tools/dlgedit/gui_graph.h           |   289 +
 src/tools/dlgedit/gui_graph_events.cc   |   339 +
 src/tools/dlgedit/gui_graph_events.h    |    60 +
 src/tools/dlgedit/gui_list.cc           |   159 +
 src/tools/dlgedit/gui_list.h            |    78 +
 src/tools/dlgedit/gui_list_events.cc    |    66 +
 src/tools/dlgedit/gui_list_events.h     |    43 +
 src/tools/dlgedit/gui_messages.cc       |   139 +
 src/tools/dlgedit/gui_messages.h        |    66 +
 src/tools/dlgedit/gui_modal_dialog.cc   |    61 +
 src/tools/dlgedit/gui_modal_dialog.h    |    81 +
 src/tools/dlgedit/gui_recent_files.cc   |    87 +
 src/tools/dlgedit/gui_recent_files.h    |   110 +
 src/tools/dlgedit/gui_resources.cc      |   168 +
 src/tools/dlgedit/gui_resources.h       |    81 +
 src/tools/dlgedit/gui_scrollable.cc     |   276 +
 src/tools/dlgedit/gui_scrollable.h      |   116 +
 src/tools/dlgedit/gui_settings.cc       |   444 +
 src/tools/dlgedit/gui_settings.h        |   127 +
 src/tools/dlgedit/gui_tooltip.cc        |   119 +
 src/tools/dlgedit/gui_tooltip.h         |    51 +
 src/tools/dlgedit/gui_tree.cc           |   540 +
 src/tools/dlgedit/gui_tree.h            |   188 +
 src/tools/dlgedit/kb_traverse.cc        |   237 +
 src/tools/dlgedit/kb_traverse.h         |   140 +
 src/tools/dlgedit/lex.loadcfg.cc        |  1819 ++
 src/tools/dlgedit/lex.loadlg.cc         |  2022 +++
 src/tools/dlgedit/loadcfg.l             |    45 +
 src/tools/dlgedit/loadlg.l              |   112 +
 src/tools/dlgedit/main.cc               |   139 +
 src/tools/dlgedit/util.cc               |   138 +
 src/tools/dlgedit/util.h                |    85 +
 src/types.h                             |     4 +-
 src/win_base.cc                         |     0
 src/win_base.h                          |     0
 src/win_border.cc                       |     0
 src/win_border.h                        |     0
 src/win_container.cc                    |     0
 src/win_container.h                     |     0
 src/win_event.cc                        |     5 +-
 src/win_event.h                         |     3 +-
 src/win_font.cc                         |    23 +-
 src/win_font.h                          |    13 +-
 src/win_image.h                         |     0
 src/win_keys.cc                         |    12 +-
 src/win_keys.h                          |    14 +-
 src/win_label.h                         |     0
 src/win_manager.cc                      |    11 +-
 src/win_object.h                        |    10 +-
 src/win_select.cc                       |    10 +-
 src/win_select.h                        |     0
 src/win_ttf.cc                          |    82 +-
 src/win_ttf.h                           |     7 +-
 src/win_types.h                         |     6 +-
 src/win_write.h                         |     0
 210 files changed, 44979 insertions(+), 51988 deletions(-)

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



More information about the Pkg-games-commits mailing list