|
Merge branch 'master' into docking
# Conflicts: # examples/example_sdl_opengl2/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # imgui.cpp |
|---|
| docs/CHANGELOG.txt |
|---|
| docs/TODO.txt |
|---|
| examples/example_emscripten/main.cpp |
|---|
| examples/example_sdl_opengl2/main.cpp |
|---|
| examples/example_sdl_opengl3/main.cpp |
|---|
| examples/example_sdl_vulkan/main.cpp |
|---|
| examples/imgui_impl_glfw.cpp |
|---|
| examples/imgui_impl_glut.cpp |
|---|
| examples/imgui_impl_glut.h |
|---|
| examples/imgui_impl_sdl.cpp |
|---|
| examples/imgui_impl_sdl.h |
|---|
| examples/imgui_impl_win32.cpp |
|---|
| imgui.cpp |
|---|
| imgui.h |
|---|
| imgui_demo.cpp |
|---|
| imgui_internal.h |
|---|
| imgui_widgets.cpp |
|---|