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
commit 3b9b1956cd6ab6fcb905fdabd2ffd14a817d17d9
2 parents 7a41e0b + 01fa934
@omar omar authored on 25 Apr 2018
Showing 12 changed files
View
.github/CONTRIBUTING.md
View
.github/issue_template.md
View
CHANGELOG.txt
View
README.md
View
examples/allegro5_example/README.md
View
examples/allegro5_example/imconfig_allegro5.h 0 → 100644
View
examples/imgui_impl_allegro5.cpp
View
imconfig.h
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_internal.h