[glfw3] 03/14: Merge tag 'upstream/3.1.1'
James Cowgill
jcowgill-guest at moszumanska.debian.org
Sat Jun 20 14:46:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
jcowgill-guest pushed a commit to branch master
in repository glfw3.
commit 1767588d2da39c963c980c15fc5837a3d624b7f3
Merge: 2311fe0 60dd192
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Fri Jun 19 19:36:33 2015 +0100
Merge tag 'upstream/3.1.1'
Upstream version 3.1.1
# gpg: Signature made Fri 19 Jun 2015 19:36:33 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 | 10 +-
CMake/AppleInfo.plist | 38 +
CMake/modules/FindEGL.cmake | 4 +-
CMake/modules/FindGLESv1.cmake | 4 +-
CMake/modules/FindGLESv2.cmake | 4 +-
CMake/modules/FindMir.cmake | 18 +
CMake/modules/FindWayland.cmake | 66 +
CMake/modules/FindXKBCommon.cmake | 34 +
CMakeLists.txt | 351 +++-
README.md | 125 +-
deps/GL/glext.h | 842 ++++++--
deps/GL/glxext.h | 82 +-
deps/GL/wglext.h | 13 +-
deps/KHR/khrplatform.h | 282 +++
deps/getopt.c | 473 +++--
deps/getopt.h | 98 +-
deps/glad.c | 753 ++++++++
deps/glad/glad.h | 1930 +++++++++++++++++++
deps/tinycthread.h | 1 +
docs/Doxyfile.in | 19 +-
docs/DoxygenLayout.xml | 188 ++
docs/build.dox | 251 ++-
docs/compat.dox | 96 +-
docs/compile.dox | 167 +-
docs/context.dox | 293 ++-
docs/extra.css | 313 +--
docs/extra.less | 370 ++++
docs/html/annotated.html | 102 -
docs/html/bc_s.png | Bin 676 -> 0 bytes
docs/html/bdwn.png | Bin 147 -> 0 bytes
docs/html/bug.html | 93 -
docs/html/build.html | 181 --
docs/html/build_8dox.html | 95 -
docs/html/classes.html | 105 -
docs/html/closed.png | Bin 132 -> 0 bytes
docs/html/compat.html | 126 --
docs/html/compat_8dox.html | 95 -
docs/html/compile.html | 216 ---
docs/html/compile_8dox.html | 95 -
docs/html/context.html | 179 --
docs/html/context_8dox.html | 95 -
.../html/dir_2ed3966b92992331bf8a66a32e738cef.html | 99 -
.../html/dir_85715018e387ccbec8815d3563c0262a.html | 99 -
.../html/dir_ced77f9823b212f18d14b97d44f17dc6.html | 101 -
docs/html/doxygen.css | 1184 ------------
docs/html/doxygen.png | Bin 3779 -> 0 bytes
docs/html/dynsections.js | 97 -
docs/html/extra.css | 312 ---
docs/html/files.html | 101 -
docs/html/ftv2blank.png | Bin 86 -> 0 bytes
docs/html/ftv2cl.png | Bin 453 -> 0 bytes
docs/html/ftv2doc.png | Bin 746 -> 0 bytes
docs/html/ftv2folderclosed.png | Bin 616 -> 0 bytes
docs/html/ftv2folderopen.png | Bin 597 -> 0 bytes
docs/html/ftv2lastnode.png | Bin 86 -> 0 bytes
docs/html/ftv2link.png | Bin 746 -> 0 bytes
docs/html/ftv2mlastnode.png | Bin 246 -> 0 bytes
docs/html/ftv2mnode.png | Bin 246 -> 0 bytes
docs/html/ftv2mo.png | Bin 403 -> 0 bytes
docs/html/ftv2node.png | Bin 86 -> 0 bytes
docs/html/ftv2ns.png | Bin 388 -> 0 bytes
docs/html/ftv2plastnode.png | Bin 229 -> 0 bytes
docs/html/ftv2pnode.png | Bin 229 -> 0 bytes
docs/html/ftv2splitbar.png | Bin 314 -> 0 bytes
docs/html/ftv2vertline.png | Bin 86 -> 0 bytes
docs/html/functions.html | 130 --
docs/html/functions_vars.html | 130 --
docs/html/glfw3_8h.html | 1374 -------------
docs/html/glfw3_8h_source.html | 764 --------
docs/html/glfw3native_8h.html | 137 --
docs/html/glfw3native_8h_source.html | 218 ---
docs/html/globals.html | 149 --
docs/html/globals_0x62.html | 131 --
docs/html/globals_0x63.html | 161 --
docs/html/globals_0x64.html | 143 --
docs/html/globals_0x65.html | 131 --
docs/html/globals_0x66.html | 134 --
docs/html/globals_0x67.html | 302 ---
docs/html/globals_0x68.html | 131 --
docs/html/globals_0x69.html | 143 --
docs/html/globals_0x6a.html | 182 --
docs/html/globals_0x6b.html | 494 -----
docs/html/globals_0x6c.html | 131 --
docs/html/globals_0x6d.html | 179 --
docs/html/globals_0x6e.html | 140 --
docs/html/globals_0x6f.html | 155 --
docs/html/globals_0x70.html | 137 --
docs/html/globals_0x72.html | 146 --
docs/html/globals_0x73.html | 233 ---
docs/html/globals_0x74.html | 131 --
docs/html/globals_0x76.html | 143 --
docs/html/globals_0x77.html | 137 --
docs/html/globals_defs.html | 145 --
docs/html/globals_defs_0x62.html | 127 --
docs/html/globals_defs_0x63.html | 154 --
docs/html/globals_defs_0x64.html | 133 --
docs/html/globals_defs_0x66.html | 130 --
docs/html/globals_defs_0x67.html | 127 --
docs/html/globals_defs_0x69.html | 133 --
docs/html/globals_defs_0x6a.html | 175 --
docs/html/globals_defs_0x6b.html | 490 -----
docs/html/globals_defs_0x6c.html | 127 --
docs/html/globals_defs_0x6d.html | 172 --
docs/html/globals_defs_0x6e.html | 136 --
docs/html/globals_defs_0x6f.html | 151 --
docs/html/globals_defs_0x70.html | 130 --
docs/html/globals_defs_0x72.html | 139 --
docs/html/globals_defs_0x73.html | 142 --
docs/html/globals_defs_0x76.html | 139 --
docs/html/globals_func.html | 411 ----
docs/html/globals_type.html | 161 --
docs/html/group__buttons.html | 265 ---
docs/html/group__clipboard.html | 169 --
docs/html/group__context.html | 288 ---
docs/html/group__error.html | 163 --
docs/html/group__errors.html | 232 ---
docs/html/group__init.html | 284 ---
docs/html/group__input.html | 950 ---------
docs/html/group__joysticks.html | 335 ----
docs/html/group__keys.html | 1814 ------------------
docs/html/group__mods.html | 157 --
docs/html/group__monitor.html | 557 ------
docs/html/group__native.html | 313 ---
docs/html/group__time.html | 147 --
docs/html/group__window.html | 1370 -------------
docs/html/index.html | 91 -
docs/html/jquery.js | 8 -
docs/html/main_8dox.html | 95 -
docs/html/modules.html | 107 --
docs/html/monitor.html | 135 --
docs/html/monitor_8dox.html | 95 -
docs/html/moving.html | 289 ---
docs/html/moving_8dox.html | 95 -
docs/html/nav_f.png | Bin 153 -> 0 bytes
docs/html/nav_g.png | Bin 95 -> 0 bytes
docs/html/nav_h.png | Bin 98 -> 0 bytes
docs/html/news.html | 189 --
docs/html/news_8dox.html | 95 -
docs/html/open.png | Bin 123 -> 0 bytes
docs/html/pages.html | 103 -
docs/html/quick.html | 287 ---
docs/html/quick_8dox.html | 95 -
docs/html/search/all_62.html | 26 -
docs/html/search/all_62.js | 8 -
docs/html/search/all_63.html | 26 -
docs/html/search/all_63.js | 9 -
docs/html/search/all_65.html | 26 -
docs/html/search/all_65.js | 5 -
docs/html/search/all_67.html | 26 -
docs/html/search/all_67.js | 323 ----
docs/html/search/all_68.html | 26 -
docs/html/search/all_68.js | 4 -
docs/html/search/all_69.html | 26 -
docs/html/search/all_69.js | 5 -
docs/html/search/all_6a.html | 26 -
docs/html/search/all_6a.js | 4 -
docs/html/search/all_6b.html | 26 -
docs/html/search/all_6b.js | 4 -
docs/html/search/all_6d.html | 26 -
docs/html/search/all_6d.js | 10 -
docs/html/search/all_6e.html | 26 -
docs/html/search/all_6e.js | 7 -
docs/html/search/all_71.html | 26 -
docs/html/search/all_71.js | 4 -
docs/html/search/all_72.html | 26 -
docs/html/search/all_72.js | 6 -
docs/html/search/all_73.html | 26 -
docs/html/search/all_73.js | 5 -
docs/html/search/all_74.html | 26 -
docs/html/search/all_74.js | 4 -
docs/html/search/all_77.html | 26 -
docs/html/search/all_77.js | 6 -
docs/html/search/classes_67.html | 26 -
docs/html/search/classes_67.js | 5 -
docs/html/search/close.png | Bin 273 -> 0 bytes
docs/html/search/defines_67.html | 26 -
docs/html/search/defines_67.js | 47 -
docs/html/search/files_62.html | 26 -
docs/html/search/files_62.js | 4 -
docs/html/search/files_63.html | 26 -
docs/html/search/files_63.js | 6 -
docs/html/search/files_67.html | 26 -
docs/html/search/files_67.js | 5 -
docs/html/search/files_6d.html | 26 -
docs/html/search/files_6d.js | 6 -
docs/html/search/files_6e.html | 26 -
docs/html/search/files_6e.js | 4 -
docs/html/search/files_71.html | 26 -
docs/html/search/files_71.js | 4 -
docs/html/search/files_77.html | 26 -
docs/html/search/files_77.js | 4 -
docs/html/search/functions_67.html | 26 -
docs/html/search/functions_67.js | 84 -
docs/html/search/groups_63.html | 26 -
docs/html/search/groups_63.js | 5 -
docs/html/search/groups_65.html | 26 -
docs/html/search/groups_65.js | 5 -
docs/html/search/groups_69.html | 26 -
docs/html/search/groups_69.js | 5 -
docs/html/search/groups_6a.html | 26 -
docs/html/search/groups_6a.js | 4 -
docs/html/search/groups_6b.html | 26 -
docs/html/search/groups_6b.js | 4 -
docs/html/search/groups_6d.html | 26 -
docs/html/search/groups_6d.js | 6 -
docs/html/search/groups_6e.html | 26 -
docs/html/search/groups_6e.js | 4 -
docs/html/search/groups_74.html | 26 -
docs/html/search/groups_74.js | 4 -
docs/html/search/groups_77.html | 26 -
docs/html/search/groups_77.js | 4 -
docs/html/search/mag_sel.png | Bin 563 -> 0 bytes
docs/html/search/nomatches.html | 12 -
docs/html/search/pages_62.html | 26 -
docs/html/search/pages_62.js | 5 -
docs/html/search/pages_63.html | 26 -
docs/html/search/pages_63.js | 5 -
docs/html/search/pages_67.html | 26 -
docs/html/search/pages_67.js | 4 -
docs/html/search/pages_6d.html | 26 -
docs/html/search/pages_6d.js | 5 -
docs/html/search/pages_6e.html | 26 -
docs/html/search/pages_6e.js | 5 -
docs/html/search/pages_73.html | 26 -
docs/html/search/pages_73.js | 4 -
docs/html/search/pages_77.html | 26 -
docs/html/search/pages_77.js | 4 -
docs/html/search/search.css | 271 ---
docs/html/search/search.js | 811 --------
docs/html/search/search_l.png | Bin 604 -> 0 bytes
docs/html/search/search_m.png | Bin 158 -> 0 bytes
docs/html/search/search_r.png | Bin 612 -> 0 bytes
docs/html/search/typedefs_67.html | 26 -
docs/html/search/typedefs_67.js | 23 -
docs/html/search/variables_62.html | 26 -
docs/html/search/variables_62.js | 5 -
docs/html/search/variables_67.html | 26 -
docs/html/search/variables_67.js | 5 -
docs/html/search/variables_68.html | 26 -
docs/html/search/variables_68.js | 4 -
docs/html/search/variables_72.html | 26 -
docs/html/search/variables_72.js | 6 -
docs/html/search/variables_73.html | 26 -
docs/html/search/variables_73.js | 4 -
docs/html/search/variables_77.html | 26 -
docs/html/search/variables_77.js | 4 -
docs/html/structGLFWgammaramp.html | 172 --
docs/html/structGLFWvidmode.html | 201 --
docs/html/sync_off.png | Bin 853 -> 0 bytes
docs/html/sync_on.png | Bin 845 -> 0 bytes
docs/html/tab_a.png | Bin 142 -> 0 bytes
docs/html/tab_b.png | Bin 169 -> 0 bytes
docs/html/tab_h.png | Bin 177 -> 0 bytes
docs/html/tab_s.png | Bin 184 -> 0 bytes
docs/html/tabs.css | 60 -
docs/html/window.html | 331 ----
docs/html/window_8dox.html | 95 -
docs/input.dox | 588 ++++++
docs/internal.dox | 12 +-
docs/intro.dox | 351 ++++
docs/main.dox | 47 +-
docs/monitor.dox | 145 +-
docs/moving.dox | 481 +++--
docs/news.dox | 129 +-
docs/quick.dox | 246 +--
docs/rift.dox | 199 ++
docs/spaces.svg | 872 +++++++++
docs/window.dox | 737 ++++---
examples/CMakeLists.txt | 50 +-
examples/boing.c | 43 +-
examples/heightmap.c | 289 +--
examples/particles.c | 1061 +++++++++++
examples/simple.c | 1 +
examples/splitview.c | 14 +-
examples/wave.c | 19 +-
include/GLFW/glfw3.h | 2014 +++++++++++++++-----
include/GLFW/glfw3native.h | 212 ++-
src/CMakeLists.txt | 70 +-
src/cocoa_clipboard.m | 70 -
src/cocoa_gamma.c | 84 -
src/cocoa_init.m | 138 +-
src/cocoa_monitor.m | 253 ++-
src/cocoa_platform.h | 99 +-
src/cocoa_window.m | 694 ++++---
src/context.c | 245 +--
src/egl_context.c | 127 +-
src/{egl_platform.h => egl_context.h} | 39 +-
src/gamma.c | 126 --
src/glfw3.pc.in | 2 +-
src/glfw3Config.cmake.in | 15 +
src/glfwConfig.cmake.in | 10 -
src/glfwConfigVersion.cmake.in | 12 -
src/glfw_config.h.in | 14 +-
src/glx_context.c | 215 +--
src/{glx_platform.h => glx_context.h} | 57 +-
src/init.c | 16 +-
src/input.c | 354 +++-
src/internal.h | 253 ++-
src/{time.c => iokit_joystick.h} | 47 +-
src/{cocoa_joystick.m => iokit_joystick.m} | 102 +-
src/joystick.c | 90 -
src/linux_joystick.c | 324 ++++
src/{clipboard.c => linux_joystick.h} | 51 +-
src/{cocoa_time.c => mach_time.c} | 14 +-
src/mir_init.c | 101 +
src/mir_monitor.c | 138 ++
src/mir_platform.h | 110 ++
src/mir_window.c | 687 +++++++
src/monitor.c | 151 +-
src/{nsgl_platform.h => nsgl_context.h} | 40 +-
src/nsgl_context.m | 157 +-
src/{x11_time.c => posix_time.c} | 21 +-
src/{time.c => posix_time.h} | 31 +-
src/{cocoa_time.c => posix_tls.c} | 51 +-
src/{clipboard.c => posix_tls.h} | 37 +-
src/wgl_context.c | 171 +-
src/{wgl_platform.h => wgl_context.h} | 49 +-
src/win32_clipboard.c | 127 --
src/win32_gamma.c | 82 -
src/win32_init.c | 206 +-
src/win32_monitor.c | 230 ++-
src/win32_platform.h | 189 +-
src/win32_time.c | 22 +-
src/{cocoa_time.c => win32_tls.c} | 54 +-
src/{time.c => win32_tls.h} | 30 +-
src/win32_window.c | 1007 +++++-----
src/window.c | 350 ++--
src/{win32_joystick.c => winmm_joystick.c} | 30 +-
src/{time.c => winmm_joystick.h} | 33 +-
src/wl_init.c | 630 ++++++
src/wl_monitor.c | 250 +++
src/wl_platform.h | 140 ++
src/wl_window.c | 524 +++++
src/x11_clipboard.c | 335 ----
src/x11_gamma.c | 123 --
src/x11_init.c | 491 +++--
src/x11_joystick.c | 259 ---
src/x11_monitor.c | 398 ++--
src/x11_platform.h | 202 +-
src/x11_window.c | 1183 +++++++++---
src/{x11_unicode.c => xkb_unicode.c} | 34 +-
src/{time.c => xkb_unicode.h} | 25 +-
tests/CMakeLists.txt | 43 +-
tests/accuracy.c | 3 +-
tests/cursor.c | 288 +++
tests/cursoranim.c | 135 ++
tests/defaults.c | 2 +-
examples/simple.c => tests/empty.c | 84 +-
tests/events.c | 293 ++-
tests/fsaa.c | 12 +-
tests/gamma.c | 8 +-
tests/glfwinfo.c | 51 +-
tests/iconify.c | 166 +-
tests/joysticks.c | 5 +-
tests/{modes.c => monitors.c} | 10 +-
tests/peter.c | 55 +-
tests/reopen.c | 4 +-
tests/sharing.c | 3 +-
tests/threads.c | 7 +-
tests/windows.c | 25 +-
360 files changed, 20745 insertions(+), 32712 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/glfw3.git
More information about the Pkg-games-commits
mailing list