Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch

Fork: 0

mark / imgui

Browse code Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch # Conflicts: # examples/imgui_impl_allegro5.cpp docking features/draw_callback_extra_arg features/fnv1a features/imvector_size_t features/premake features/range_select features/tex_round_corners master v1.71 v1.70 v1.69
commit 75641926e199e2db3a290a396dcca25a844e053f 2 parents def723b + b2e7a38 omar authored on 27 Feb 2019

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/example_allegro5/README.md

Ignore Space Show notes View examples/imgui_impl_allegro5.cpp

Show line notes below