[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 7dd14b8e595b16ae5cd79d8d82f0cb747ea7df98
Merge: eef4c99 b6fef3a
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Jan 3 01:26:11 2016 +0000

    Merge branch 'upstream'

 doomsday/api/dd_version.h                          |   4 +-
 doomsday/build/scripts/packres.py                  |   1 +
 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/resource/resourcesystem.cpp    |   2 +-
 .../client/src/ui/dialogs/vrsettingsdialog.cpp     |   6 +-
 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/libappfw/include/de/vr/oculusrift.h       |  12 +-
 doomsday/libappfw/src/vr/oculusrift.cpp            |  15 +-
 doomsday/libcore/include/de/data/reader.h          |   4 +-
 doomsday/libcore/include/de/libcore.h              |   2 +-
 doomsday/libcore/include/de/net/packet.h           |   6 +-
 doomsday/libcore/net.dengine.stdlib.pack/Info      |   2 +-
 doomsday/libcore/src/core/log.cpp                  |   2 +-
 doomsday/libcore/src/data/archive.cpp              |   8 +-
 doomsday/libcore/src/data/record.cpp               |   4 +-
 doomsday/libcore/src/data/value.cpp                |   2 +-
 doomsday/libcore/src/data/variable.cpp             |   2 +-
 doomsday/libcore/src/filesys/archivefeed.cpp       |   4 +-
 doomsday/libcore/src/filesys/directoryfeed.cpp     |   4 +-
 doomsday/libcore/src/filesys/filesystem.cpp        |   2 +-
 .../libcore/src/scriptsys/builtinexpression.cpp    |   4 +-
 .../libcore/src/scriptsys/dictionaryexpression.cpp |  16 +-
 doomsday/libcore/src/scriptsys/expression.cpp      |  18 +-
 .../libcore/src/scriptsys/functionstatement.cpp    |  10 +-
 doomsday/libcore/src/scriptsys/module.cpp          |   6 +-
 .../libcore/src/scriptsys/operatorexpression.cpp   |  26 +-
 doomsday/libcore/src/scriptsys/parser.cpp          | 173 +++++++-------
 doomsday/libcore/src/scriptsys/process.cpp         |   4 +-
 doomsday/libcore/src/scriptsys/scriptsystem.cpp    |   2 +-
 doomsday/libcore/src/scriptsys/statement.cpp       |  30 +--
 doomsday/libgui/gui.doxy                           |   2 +-
 doomsday/libgui/net.dengine.stdlib.gui.pack/Info   |   2 +-
 doomsday/libgui/src/graphics/atlas.cpp             |   2 +-
 doomsday/libshell/src/abstractlink.cpp             |   6 +-
 doomsday/net.dengine.base.pack/Info                |   2 +-
 doomsday/plugins/common/include/dmu_archiveindex.h |   4 +-
 doomsday/plugins/doom/data/doom2-freedm.mapinfo    | 262 +++++++++++++++++++++
 doomsday/plugins/doom/defs/doom2-freedm.ded        |  28 +++
 doomsday/plugins/doom/include/doomdef.h            |   6 +-
 doomsday/plugins/doom/src/d_api.c                  |  13 +
 doomsday/sdk-qch.doxy                              |   4 +-
 .../shell/shell-gui/src/localserverdialog.cpp      |  13 +-
 49 files changed, 533 insertions(+), 200 deletions(-)

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