| Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h # imgui.cpp | 
|---|
| CHANGELOG.txt | 
|---|
| README.md | 
|---|
| examples/imgui_impl_win32.cpp | 
|---|
| imconfig.h | 
|---|
| imgui.cpp | 
|---|
| imgui.h | 
|---|
| imgui_demo.cpp | 
|---|
| imgui_draw.cpp | 
|---|
| imgui_internal.h | 
|---|
| stb_textedit.h | 
|---|