[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 4f8ada4b087079734b7b466fe3d6ab2939f67ba6
Merge: 077e893 79e068c
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Oct 4 00:55:37 2015 +0000

    Merge branch 'upstream'

 doomsday/api/dd_version.h                          |   4 +-
 doomsday/client/include/ui/b_util.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/client/src/clientapp.cpp                  |   2 +
 doomsday/client/src/ui/b_util.cpp                  |   6 +-
 doomsday/client/src/ui/commandbinding.cpp          |   4 +-
 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/include/de/graphics/glinfo.h       |   4 +-
 doomsday/libgui/include/de/graphics/gltarget.h     |   4 +-
 doomsday/libgui/net.dengine.stdlib.gui.pack/Info   |   2 +-
 doomsday/libgui/src/graphics/glentrypoints.cpp     | 159 ++++++++++++---------
 doomsday/libgui/src/graphics/glframebuffer.cpp     |  74 +++++++---
 doomsday/libgui/src/graphics/glinfo.cpp            |   6 +-
 doomsday/libgui/src/graphics/gltarget.cpp          |  16 ++-
 doomsday/net.dengine.base.pack/Info                |   2 +-
 doomsday/sdk-qch.doxy                              |   4 +-
 25 files changed, 188 insertions(+), 125 deletions(-)

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