[prboom+] 04/06: Merge tag 'upstream/2.5.1.4_svn4444+dfsg1'

[Fabian Greffrath]

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

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

commit 370c044f99ad2292c3de2c07a2c4b181c721d259
Merge: fad2008 41dff94
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Sep 29 06:21:54 2015 +0200

    Merge tag 'upstream/2.5.1.4_svn4444+dfsg1'
    
    Upstream version 2.5.1.4~svn4444+dfsg1

 ICONS/Makefile.am         |  4 ++--
 ICONS/prboom-plus.desktop | 10 ++++++++++
 src/hu_stuff.c            | 10 +++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

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