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

[James Cowgill]

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

jcowgill-guest pushed a commit to branch master
in repository glfw3.

commit 44215778f4106af916d3967a46506598c0967a9d
Merge: 70ea279 a4e3f34
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Mon Oct 12 21:12:13 2015 +0100

    Merge tag 'upstream/3.1.2'
    
    Upstream version 3.1.2
    
    # gpg: Signature made Mon 12 Oct 2015 21:12:09 BST using RSA key ID EA2D01EF
    # gpg: Good signature from "James Cowgill <james410 at cowgill.org.uk>"
    # gpg:                 aka "James Cowgill <jc1311 at york.ac.uk>"
    # gpg:                 aka "James Cowgill (Imagination Technologies) <James.Cowgill at imgtec.com>"

 .gitignore                                         |  11 +-
 .../{AppleInfo.plist => MacOSXBundleInfo.plist.in} |  22 +-
 CMake/modules/FindEGL.cmake                        |   2 +-
 CMake/modules/FindGLESv1.cmake                     |   2 +-
 CMake/modules/FindGLESv2.cmake                     |   2 +-
 CMakeLists.txt                                     | 117 ++--
 README.md                                          |  94 +++-
 deps/linmath.h                                     | 571 ++++++++++++++++++++
 deps/tinycthread.c                                 |   7 +-
 docs/build.dox                                     |   9 +-
 docs/compat.dox                                    |  10 +
 docs/compile.dox                                   |  55 +-
 docs/context.dox                                   |   9 +-
 docs/input.dox                                     |  25 +-
 docs/intro.dox                                     |   9 +-
 docs/moving.dox                                    |   2 +-
 docs/quick.dox                                     |   5 +-
 docs/window.dox                                    |  67 ++-
 examples/CMakeLists.txt                            |  65 +--
 examples/boing.c                                   |  60 +--
 examples/gears.c                                   |  30 +-
 examples/particles.c                               |  25 +-
 examples/splitview.c                               | 101 +++-
 examples/wave.c                                    |  18 +-
 include/GLFW/glfw3.h                               |  74 ++-
 src/cocoa_init.m                                   |   4 +-
 src/cocoa_monitor.m                                |  68 +--
 src/cocoa_platform.h                               |  16 +-
 src/cocoa_window.m                                 | 151 ++++--
 src/context.c                                      |  45 +-
 src/egl_context.c                                  | 304 ++++++++---
 src/egl_context.h                                  |  85 ++-
 src/glfw_config.h.in                               |  14 +-
 src/glx_context.c                                  | 197 ++++---
 src/glx_context.h                                  |  83 +--
 src/init.c                                         |  13 +-
 src/input.c                                        |   4 +-
 src/internal.h                                     |  63 +--
 src/iokit_joystick.h                               |  21 +-
 src/iokit_joystick.m                               | 479 ++++++++---------
 src/linux_joystick.h                               |   6 +-
 src/mir_init.c                                     |  14 +-
 src/mir_monitor.c                                  |  40 +-
 src/mir_platform.h                                 |  20 +-
 src/mir_window.c                                   | 356 ++++++++-----
 src/monitor.c                                      |   4 +
 src/nsgl_context.h                                 |   6 +-
 src/nsgl_context.m                                 |  14 +-
 src/posix_time.h                                   |   6 +-
 src/posix_tls.c                                    |   6 +-
 src/posix_tls.h                                    |  12 +-
 src/wgl_context.c                                  | 256 ++++-----
 src/wgl_context.h                                  |  28 +-
 src/win32_init.c                                   |  24 +-
 src/win32_monitor.c                                |  81 +--
 src/win32_platform.h                               |  23 +-
 src/win32_tls.c                                    |   6 +-
 src/win32_tls.h                                    |  12 +-
 src/win32_window.c                                 | 181 ++++---
 src/window.c                                       | 195 +++----
 src/winmm_joystick.h                               |   6 +-
 src/wl_init.c                                      |  15 +-
 src/wl_platform.h                                  |  17 +-
 src/wl_window.c                                    |  81 +--
 src/x11_init.c                                     |  94 ++--
 src/x11_monitor.c                                  |  49 +-
 src/x11_platform.h                                 |  39 +-
 src/x11_window.c                                   | 591 ++++++++++++---------
 src/xkb_unicode.h                                  |   6 +-
 tests/CMakeLists.txt                               |  20 +-
 tests/accuracy.c                                   | 128 -----
 tests/clipboard.c                                  |  10 +-
 tests/cursor.c                                     | 367 +++++++------
 tests/cursoranim.c                                 | 135 -----
 tests/defaults.c                                   | 131 -----
 tests/glfwinfo.c                                   | 454 ++++++++++++----
 tests/iconify.c                                    |   3 +
 tests/monitors.c                                   |   6 +-
 tests/{fsaa.c => msaa.c}                           |  14 +-
 tests/peter.c                                      | 151 ------
 tests/reopen.c                                     |  15 +-
 tests/tearing.c                                    |  94 +++-
 tests/windows.c                                    |  48 +-
 83 files changed, 3802 insertions(+), 2901 deletions(-)

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