[deng] 03/04: 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 6ac293a3dae3c68feedcebbeb8a281bc9043d4aa
Merge: 339c0fb 8ad4dd9
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Sep 11 23:47:12 2016 +0000

    Merge branch 'upstream'

 doomsday/api/dd_version.h                                        | 4 ++--
 doomsday/client/net.dengine.client.pack/Info.dei                 | 2 +-
 doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info   | 2 +-
 doomsday/client/net.dengine.client.pack/renderer.pack/Info       | 2 +-
 .../net.dengine.client.pack/renderer.pack/lensflares.pack/Info   | 2 +-
 doomsday/client/src/dd_main.cpp                                  | 9 +++++++++
 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/sdk-qch.doxy                                            | 4 ++--
 16 files changed, 26 insertions(+), 17 deletions(-)

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