[dhewm3] 03/03: Merge tag 'upstream/1.4.0+dfsg'

[Tobias Frost]

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

tobi pushed a commit to annotated tag debian/1.4.0+dfsg-1
in repository dhewm3.

commit 4bb251a0a2a9dacb452cfafcbce0d0f5c55cfe36
Merge: 2d1ef20 75bb801
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sat Nov 21 23:20:42 2015 +0100

    Merge tag 'upstream/1.4.0+dfsg'
    
    Upstream version 1.4.0+dfsg
    
    # gpg: Unterschrift vom Sa 21 Nov 2015 23:20:38 CET mittels RSA-Schlüssel ID 17BD5D36
    # gpg: Korrekte Unterschrift von "Tobias Frost <tobi at coldtobi.de>"
    # gpg:                     alias "Tobias Frost <tobi at frost.de>"
    # gpg:                     alias "[jpeg image of size 5939]"
    # gpg:                     alias "Tobias Frost <tobi at debian.org>"

 .gitignore               |    7 +
 ChangeLog                | 1947 ----------------------------------------------
 neo/framework/Licensee.h |    2 +-
 neo/sys/events.cpp       |    6 +-
 4 files changed, 13 insertions(+), 1949 deletions(-)

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