Merge branch 'master' into viewport
# Conflicts: # examples/allegro5_example/imgui_impl_a5.cpp # examples/allegro5_example/imgui_impl_a5.h # examples/allegro5_example/imgui_impl_allegro5.cpp # examples/allegro5_example/imgui_impl_allegro5.h # examples/allegro5_example/main.cpp # examples/imgui_impl_allegro5.cpp # examples/imgui_impl_allegro5.h # imgui.cpp # imgui_internal.h |
---|
.github/CONTRIBUTING.md |
---|
.github/issue_template.md |
---|
CHANGELOG.txt |
---|
README.md |
---|
examples/allegro5_example/README.md |
---|
examples/allegro5_example/imconfig_allegro5.h 0 → 100644 |
---|
examples/imgui_impl_allegro5.cpp |
---|
imconfig.h |
---|
imgui.cpp |
---|
imgui.h |
---|
imgui_demo.cpp |
---|
imgui_internal.h |
---|