Browse code Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui_widgets.cpp docking
commit 87ded34f9f7f13f99130c171632bc8e21b857d62 2 parents ff0f9aa + 9da48c1 omar authored on 22 Feb 2019

Showing 16 changed files

• docs/CHANGELOG.txt
• docs/README.md
• docs/TODO.txt
• examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj
• examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj
• examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj
• examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj
• examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj
• examples/example_win32_directx9/example_win32_directx9.vcxproj
• examples/imgui_impl_opengl3.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj

Ignore Space Show notes View examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj

Ignore Space Show notes View examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj

Ignore Space Show notes View examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj

Ignore Space Show notes View examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj

Ignore Space Show notes View examples/example_win32_directx9/example_win32_directx9.vcxproj

Ignore Space Show notes View examples/imgui_impl_opengl3.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

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below