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

# Conflicts:
#	examples/imgui_impl_allegro5.cpp
This commit is contained in:
omar
2019-02-27 14:39:41 +01:00
3 changed files with 29 additions and 19 deletions

View File

@ -55,6 +55,7 @@ Other Changes:
- Log/Capture: Fixed CollapsingHeader trailing ascii representation being "#" instead of "##".
- Examples: OpenGL: Fix for OSX not supporting OpenGL 4.5, we don't try to read GL_CLIP_ORIGIN
even if the OpenGL headers/loader happens to define the value. (#2366, #2186)
- Examples: Allegro: Added support for touch events (emulating mouse). (#2219) [@dos1]
-----------------------------------------------------------------------