Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp docking
commit 352695bc57f24401741bf74675ce4d3a1709f42a 2 parents 7407749 + 357534e omar authored on 24 Jul 2018

Showing 24 changed files

• .github/CONTRIBUTING.md
• .github/issue_template.md
• .github/pull_request_template.md
• CHANGELOG.txt
• README.md
• 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_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_sdl.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h

Ignore Space Show notes View .github/CONTRIBUTING.md

Ignore Space Show notes View .github/issue_template.md

Ignore Space Show notes View .github/pull_request_template.md

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View README.md

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_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_sdl.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below