Browse code Merge branch 'master' into viewport + specific changes for GLFW callbacks # Conflicts: # examples/example_glfw_opengl3/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx9/main.cpp # examples/imgui_impl_glfw.cpp docking
commit a3d6554e8ea21a5610320170c4ae75a2c90cf577 2 parents 797f204 + 7723543 omar authored on 8 Nov 2018

Showing 17 changed files

• docs/CHANGELOG.txt
• examples/example_allegro5/main.cpp
• examples/example_apple_opengl2/main.mm
• examples/example_freeglut_opengl2/main.cpp
• examples/example_glfw_opengl2/main.cpp
• examples/example_glfw_opengl3/main.cpp
• examples/example_glfw_vulkan/main.cpp
• examples/example_marmalade/main.cpp
• examples/example_sdl_opengl2/main.cpp
• examples/example_sdl_opengl3/main.cpp
• examples/example_sdl_vulkan/main.cpp
• examples/example_win32_directx10/main.cpp
• examples/example_win32_directx11/main.cpp
• examples/example_win32_directx12/main.cpp
• examples/example_win32_directx9/main.cpp
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_glfw.h

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/example_allegro5/main.cpp

Ignore Space Show notes View examples/example_apple_opengl2/main.mm

Ignore Space Show notes View examples/example_freeglut_opengl2/main.cpp

Ignore Space Show notes View examples/example_glfw_opengl2/main.cpp

Ignore Space Show notes View examples/example_glfw_opengl3/main.cpp

Ignore Space Show notes View examples/example_glfw_vulkan/main.cpp

Ignore Space Show notes View examples/example_marmalade/main.cpp

Ignore Space Show notes View examples/example_sdl_opengl2/main.cpp

Ignore Space Show notes View examples/example_sdl_opengl3/main.cpp

Ignore Space Show notes View examples/example_sdl_vulkan/main.cpp

Ignore Space Show notes View examples/example_win32_directx10/main.cpp

Ignore Space Show notes View examples/example_win32_directx11/main.cpp

Ignore Space Show notes View examples/example_win32_directx12/main.cpp

Ignore Space Show notes View examples/example_win32_directx9/main.cpp

Ignore Space Show notes View examples/imgui_impl_glfw.cpp

Ignore Space Show notes View examples/imgui_impl_glfw.h

Show line notes below