[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 20278f2a7305b5390e90ad279d62ce59ec8f4f43
Merge: e476892 a5cf2eb
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Mon Jul 6 20:33:55 2015 +0000

    Merge branch 'upstream'

 doomsday/api/dd_version.h                          |   4 +-
 doomsday/client/include/versioninfo.h              |  16 ++-
 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 +-
 .../res/macx/English.lproj/InfoPlist.strings       | Bin 586 -> 0 bytes
 doomsday/client/res/macx/Info.plist                |  26 ----
 doomsday/client/res/macx/deng.icns                 | Bin 934433 -> 0 bytes
 doomsday/client/res/windows/.gitignore             |   2 -
 doomsday/client/res/windows/doomsday.exe.manifest  |  10 --
 doomsday/client/res/windows/doomsday.ico           | Bin 92099 -> 0 bytes
 doomsday/client/res/windows/doomsday.rc            | 150 ---------------------
 doomsday/client/src/def_main.cpp                   |   4 +-
 doomsday/client/src/resource/hq2x.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/libcore/res/win32/.gitignore              |   1 -
 doomsday/libcore/res/win32/core.rc.in              | 143 --------------------
 doomsday/libcore/res/win32/deng_core.dll.manifest  |  10 --
 doomsday/libcore/res/win32/generate_rc.py          |  45 -------
 doomsday/libcore/res/win32/resource.h              |  15 ---
 doomsday/libdoomsday/src/defs/dedparser.cpp        |  11 +-
 doomsday/libgui/gui.doxy                           |   2 +-
 doomsday/libgui/net.dengine.stdlib.gui.pack/Info   |   2 +-
 doomsday/net.dengine.base.pack/Info                |   2 +-
 doomsday/plugins/doom/data/conhelp.txt             |  15 ++-
 doomsday/plugins/doom/src/d_main.cpp               |   3 +-
 doomsday/plugins/heretic/data/conhelp.txt          |  12 +-
 doomsday/plugins/hexen/data/conhelp.txt            |  15 ++-
 doomsday/plugins/hexen/src/p_mobj.c                |   3 +
 doomsday/sdk-qch.doxy                              |   4 +-
 .../res/macx/AppIcon.appiconset/icon_128x128.png   | Bin 21935 -> 0 bytes
 .../macx/AppIcon.appiconset/icon_128x128 at 2x.png    | Bin 78125 -> 0 bytes
 .../res/macx/AppIcon.appiconset/icon_16x16.png     | Bin 848 -> 0 bytes
 .../res/macx/AppIcon.appiconset/icon_16x16 at 2x.png  | Bin 2543 -> 0 bytes
 .../res/macx/AppIcon.appiconset/icon_256x256.png   | Bin 78125 -> 0 bytes
 .../macx/AppIcon.appiconset/icon_256x256 at 2x.png    | Bin 291599 -> 0 bytes
 .../res/macx/AppIcon.appiconset/icon_32x32.png     | Bin 2461 -> 0 bytes
 .../res/macx/AppIcon.appiconset/icon_32x32 at 2x.png  | Bin 7333 -> 0 bytes
 .../res/macx/AppIcon.appiconset/icon_512x512.png   | Bin 291599 -> 0 bytes
 .../res/macx/English.lproj/InfoPlist.strings       | Bin 596 -> 0 bytes
 .../shell/shell-gui/res/macx/Info-Xcode.plist      |  26 ----
 doomsday/tools/shell/shell-gui/res/macx/Info.plist |  28 ----
 doomsday/tools/shell/shell-gui/res/macx/shell.icns | Bin 799550 -> 0 bytes
 doomsday/tools/shell/shell-gui/res/shell.png       | Bin 62561 -> 0 bytes
 doomsday/tools/shell/shell-gui/res/shell.qrc       |   9 --
 doomsday/tools/shell/shell-gui/res/shell at 2x.png    | Bin 208205 -> 0 bytes
 .../tools/shell/shell-gui/res/toolbar_console.png  | Bin 4004 -> 0 bytes
 .../shell/shell-gui/res/toolbar_placeholder.png    | Bin 3888 -> 0 bytes
 .../tools/shell/shell-gui/res/toolbar_status.png   | Bin 4491 -> 0 bytes
 .../tools/shell/shell-gui/res/windows/shell.ico    | Bin 99017 -> 0 bytes
 .../tools/shell/shell-gui/res/windows/shell.rc     |   1 -
 57 files changed, 71 insertions(+), 510 deletions(-)

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