[deng] 05/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 9996f2bf7f1546529432a96cb8e81f91d82b9322
Merge: 4ee35ca be6d3c5
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Sep 5 18:13:59 2015 +0000

    Merge branch 'upstream'

 doomsday/api/dd_version.h                          |  4 +--
 doomsday/client/client.pro                         |  6 ++--
 doomsday/client/include/macx/cursor_macx.h         | 30 ++++++++++++++++++++
 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/macx/cursor_macx.mm            | 32 ++++++++++++++++++++++
 doomsday/client/src/ui/mouse_qt.cpp                | 14 ++++++++++
 doomsday/config_unix.pri                           |  4 ++-
 doomsday/config_unix_any.pri                       |  4 +++
 doomsday/dep_assimp.pri                            |  6 ++--
 doomsday/dep_curses.pri                            |  6 ++--
 doomsday/dep_fluidsynth.pri                        |  6 ++--
 doomsday/dep_glib.pri                              |  6 ++--
 doomsday/dep_openal.pri                            |  6 ++--
 doomsday/dep_opengl.pri                            |  4 +--
 doomsday/dep_sdl.pri                               |  4 +--
 doomsday/dep_sdl2.pri                              | 10 +++----
 doomsday/dep_zlib.pri                              |  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/libgui.pro                         |  8 +++---
 doomsday/libgui/net.dengine.stdlib.gui.pack/Info   |  2 +-
 doomsday/net.dengine.base.pack/Info                |  2 +-
 doomsday/sdk-qch.doxy                              |  4 +--
 31 files changed, 134 insertions(+), 50 deletions(-)

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