[deng] 02/06: 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 0bc9c66fae370efedfaa96b617331b1715a7674e
Merge: 8c24c6c b32db2f
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Aug 29 18:38:04 2015 +0000

    Merge branch 'upstream'

 doomsday/api/dd_version.h                                            | 4 ++--
 doomsday/client/include/world/p_players.h                            | 5 +++++
 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/ui/b_util.cpp                                    | 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/sdk-qch.doxy                                                | 4 ++--
 17 files changed, 24 insertions(+), 17 deletions(-)

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