Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # imgui_demo.cpp docking
commit ee98a069f037c75c18f7f879b33efcbe1239ae42 2 parents b30b828 + d3be918 omar authored on 16 Jul 2018

Showing 20 changed files

• CHANGELOG.txt
• TODO.txt
• examples/example_allegro5/main.cpp
• examples/example_apple_metal/Shared/Renderer.mm
• 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_dx10.cpp
• examples/imgui_impl_dx11.cpp
• imgui_demo.cpp

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View TODO.txt

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

Ignore Space Show notes View examples/example_apple_metal/Shared/Renderer.mm

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_dx10.cpp

Ignore Space Show notes View examples/imgui_impl_dx11.cpp

Ignore Space Show notes View imgui_demo.cpp

Show line notes below