GitBucket
|
Merge branch 'master' into viewport
# Conflicts: # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp |
|---|
|
|
| CHANGELOG.txt |
|---|
| TODO.txt |
|---|
| examples/apple_example/imguiex-ios/GameViewController.m |
|---|
| examples/apple_example/imguiex-ios/debug_hud.h |
|---|
| examples/apple_example/imguiex-ios/imgui_impl_ios.mm |
|---|
| examples/imgui_impl_glfw.cpp |
|---|
| examples/imgui_impl_glfw.h |
|---|
| examples/imgui_impl_opengl3.cpp |
|---|
| examples/imgui_impl_opengl3.h |
|---|
| imgui.cpp |
|---|
| imgui.h |
|---|
| imgui_demo.cpp |
|---|
| imgui_draw.cpp |
|---|