[prboom+] branch master updated (3e29ff7 -> 8619762)

[Fabian Greffrath]

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

fabian pushed a change to branch master
in repository prboom+.

      from  3e29ff7   Merge tag 'upstream/2.5.1.4_svn4449+dfsg1'
       new  a493cbd   prepare new upstream SVN snapshot
       new  cde5891   Imported Upstream version 2.5.1.4~svn4453+dfsg1
       new  8c74fd9   Merge tag 'upstream/2.5.1.4_svn4453+dfsg1'
       new  09075a9   install bash-completion
       new  975c2d2   prepare new upstream SVN snapshot
       new  e92f95b   Imported Upstream version 2.5.1.4~svn4454+dfsg1
       new  a4de5a6   Merge tag 'upstream/2.5.1.4_svn4454+dfsg1'
       new  1b575d9   remove debian/patches/remove_google_adsense.patch, applied upstream
       new  8619762   update debian/changelog

The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ICONS/Makefile.am                          |  2 +-
 ICONS/prboom-plus.bash                     | 38 ++++++++++++++++++++++++++++++
 debian/README.source                       |  2 +-
 debian/changelog                           |  9 ++++---
 debian/control                             |  1 +
 debian/patches/remove_google_adsense.patch | 23 ------------------
 debian/patches/series                      |  1 -
 debian/prboom-plus.bash-completion         |  1 +
 debian/rules                               |  2 +-
 doc/prboom-plus-history.html               |  8 -------
 src/MUSIC/flplayer.c                       |  5 +++-
 src/d_event.h                              |  1 +
 src/g_game.c                               |  9 +++++++
 src/g_game.h                               |  1 +
 src/gl_main.c                              |  6 ++---
 src/gl_struct.h                            |  2 +-
 src/m_menu.c                               |  6 ++---
 src/r_things.c                             | 31 ++++++++++++------------
 18 files changed, 86 insertions(+), 62 deletions(-)
 create mode 100644 ICONS/prboom-plus.bash
 delete mode 100644 debian/patches/remove_google_adsense.patch
 create mode 100644 debian/prboom-plus.bash-completion

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