[ioquake3] 08/10: Merge tag 'upstream/1.36+u20150926+dfsg1'

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository ioquake3.

commit 6c26025c110c1cdad8311073a84aa4e79954c2ab
Merge: 4937226 728865d
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Oct 2 09:39:41 2015 +0100

    Merge tag 'upstream/1.36+u20150926+dfsg1'
    
    Upstream version 1.36+u20150926+dfsg1

 .gitignore                         |   4 +-
 README.md                          | 263 +--------------------------------
 code/cgame/cg_local.h              |   4 -
 code/cgame/cg_newdraw.c            |   2 +-
 code/client/cl_curl.c              |  19 ++-
 code/q3_ui/ui_addbots.c            |  40 ++---
 code/qcommon/cm_patch.c            |   2 +-
 code/qcommon/cmd.c                 |   8 +-
 code/qcommon/cvar.c                |   3 +
 code/qcommon/files.c               |  44 +++++-
 code/qcommon/q_shared.h            |  24 +--
 code/qcommon/qcommon.h             |   1 +
 code/sys/sys_unix.c                |  30 ++++
 code/sys/sys_win32.c               |  59 ++++++++
 code/ui/ui_main.c                  |   2 +-
 misc/linux/start_server.sh         |   2 +-
 misc/msvc10/cgame.vcxproj          |  11 ++
 misc/msvc10/cgame.vcxproj.filters  |   3 +
 misc/msvc10/cgame.vcxproj.user     |   3 -
 misc/msvc10/game.vcxproj           |  28 ++--
 misc/msvc10/game.vcxproj.filters   |  40 ++---
 misc/msvc10/game.vcxproj.user      |   3 -
 misc/msvc10/q3_ui.vcxproj          |  34 +++--
 misc/msvc10/q3_ui.vcxproj.filters  |   9 +-
 misc/msvc10/q3_ui.vcxproj.user     |   3 -
 misc/msvc10/quake3.vcxproj         | 213 +++++++++++++++------------
 misc/msvc10/quake3.vcxproj.filters | 294 ++++++++++++++++++-------------------
 misc/msvc10/quake3.vcxproj.user    |  55 -------
 misc/msvc10/ui.vcxproj             |  29 ++--
 misc/msvc10/ui.vcxproj.filters     |  15 +-
 misc/msvc10/ui.vcxproj.user        |   3 -
 misc/msvc11/cgame.vcxproj          |   9 ++
 misc/msvc11/cgame.vcxproj.filters  |   3 +
 misc/msvc11/game.vcxproj           |  26 ++--
 misc/msvc11/game.vcxproj.filters   |  40 ++---
 misc/msvc11/ioq3.v11.suo           | Bin 23040 -> 0 bytes
 misc/msvc11/q3_ui.vcxproj          |  33 +++--
 misc/msvc11/q3_ui.vcxproj.filters  |   9 +-
 misc/msvc11/quake3.vcxproj         | 151 +++++++++----------
 misc/msvc11/quake3.vcxproj.filters |  87 +++++------
 misc/msvc11/ui.vcxproj             |  28 ++--
 misc/msvc11/ui.vcxproj.filters     |  15 +-
 misc/osx/start_server.sh           |   3 +
 43 files changed, 782 insertions(+), 872 deletions(-)

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