[deng] 02/03: Merge branch 'upstream'

[Michael Gilbert]

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

mgilbert pushed a commit to branch master
in repository deng.

commit 436e039f51d4295ffdaf4b7a1cda13e1c289906a
Merge: 557bd40 6b7af60
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Nov 15 19:35:57 2015 +0000

    Merge branch 'upstream'

 doomsday/api/dd_version.h                          |  4 +--
 doomsday/client/net.dengine.client.pack/Info.dei   |  2 +-
 .../net.dengine.client.pack/defaultstyle.pack/Info |  2 +-
 .../net.dengine.client.pack/renderer.pack/Info     |  2 +-
 .../renderer.pack/lensflares.pack/Info             |  2 +-
 doomsday/doc/output/doomsday.6                     |  2 +-
 doomsday/doc/readme/readme.ame                     |  2 +-
 doomsday/doc/server/server.ame                     |  2 +-
 doomsday/doc/shell-text/shell-text.ame             |  2 +-
 doomsday/libappfw/appfw.doxy                       |  2 +-
 doomsday/libcore/net.dengine.stdlib.pack/Info      |  2 +-
 doomsday/libgui/gui.doxy                           |  2 +-
 doomsday/libgui/net.dengine.stdlib.gui.pack/Info   |  2 +-
 doomsday/net.dengine.base.pack/Info                |  2 +-
 doomsday/plugins/hexen/src/a_action.c              | 35 +++++++++++-----------
 doomsday/sdk-qch.doxy                              |  4 +--
 doomsday/tools/savegametool/src/main.cpp           |  2 +-
 .../tools/savegametool/src/nativetranslator.cpp    |  2 +-
 18 files changed, 36 insertions(+), 37 deletions(-)

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