[glfw3] 02/03: Merge tag 'upstream/3.2.1'

[James Cowgill]

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

jcowgill pushed a commit to branch master
in repository glfw3.

commit 9b51a16d5a37d93737307d5807ce59518d96e80f
Merge: 49ce7a7 167869e
Author: James Cowgill <jcowgill at debian.org>
Date:   Thu Aug 18 16:38:37 2016 +0000

    Merge tag 'upstream/3.2.1'
    
    Upstream version 3.2.1
    
    # gpg: Signature made Thu 18 Aug 2016 16:38:36 UTC
    # gpg:                using RSA key C7F1676DEA2D01EF
    # gpg: Good signature from "James Cowgill <james410 at cowgill.org.uk>" [unknown]
    # gpg:                 aka "James Cowgill <jc1311 at york.ac.uk>" [unknown]
    # gpg:                 aka "James Cowgill <jcowgill at debian.org>" [unknown]
    # gpg:                 aka "James Cowgill (Imagination Technologies) <James.Cowgill at imgtec.com>" [unknown]
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: CA84 63DD 0C39 1573 B4C9  834F AEED 6158 020E AFFF
    #      Subkey fingerprint: F88C 6DE4 3699 E8F3 B3B5  4C10 C7F1 676D EA2D 01EF

 .github/CONTRIBUTING.md        | 330 +++++++++++++++++++++++++++++++++++------
 CMake/modules/FindVulkan.cmake |   5 +-
 CMakeLists.txt                 |  26 +++-
 README.md                      | 189 +++++++++++------------
 deps/linmath.h                 |  51 ++++---
 docs/build.dox                 |  60 +++++---
 docs/compat.dox                |   2 +-
 docs/compile.dox               |  11 +-
 docs/context.dox               |   5 +-
 docs/input.dox                 |   5 +-
 docs/intro.dox                 |  29 ++--
 docs/monitor.dox               |   5 +-
 docs/news.dox                  |   2 +-
 docs/vulkan.dox                |   9 +-
 docs/window.dox                |  14 +-
 include/GLFW/glfw3.h           |  37 +++--
 src/cocoa_init.m               |   5 +-
 src/cocoa_joystick.h           |  15 +-
 src/cocoa_joystick.m           |  56 +++----
 src/cocoa_monitor.m            |   4 +-
 src/cocoa_platform.h           |   5 +-
 src/cocoa_window.m             |  12 +-
 src/context.c                  | 142 ++++++++++--------
 src/egl_context.c              | 122 +++++++++------
 src/egl_context.h              |   2 +-
 src/glfw_config.h.in           |   2 +
 src/glx_context.c              | 135 ++++++++++-------
 src/glx_context.h              |   3 +-
 src/init.c                     |   6 +-
 src/input.c                    |   6 +-
 src/internal.h                 |  24 +--
 src/linux_joystick.c           |   4 +-
 src/linux_joystick.h           |   1 -
 src/mir_init.c                 |   3 -
 src/mir_platform.h             |   3 -
 src/mir_window.c               |   4 +-
 src/nsgl_context.h             |   1 -
 src/nsgl_context.m             |  27 ++--
 src/vulkan.c                   |  55 ++++---
 src/wgl_context.c              | 311 +++++++++++++++++++-------------------
 src/wgl_context.h              |  10 +-
 src/win32_init.c               |  10 +-
 src/win32_joystick.c           |   6 +-
 src/win32_joystick.h           |   2 +-
 src/win32_platform.h           |   5 -
 src/win32_window.c             | 140 +++++++----------
 src/window.c                   |   5 +-
 src/wl_init.c                  |   3 -
 src/wl_monitor.c               |   2 +-
 src/wl_platform.h              |   4 -
 src/wl_window.c                |   4 +-
 src/x11_init.c                 |   9 +-
 src/x11_platform.h             |   9 +-
 src/x11_window.c               | 188 ++++++++++++-----------
 tests/CMakeLists.txt           |   4 +-
 tests/gamma.c                  |   3 +
 tests/glfwinfo.c               |   5 +-
 tests/tearing.c                |   2 +-
 tests/timeout.c                | 194 ++++++++++++------------
 59 files changed, 1349 insertions(+), 984 deletions(-)

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