| commit | 75641926e199e2db3a290a396dcca25a844e053f | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Wed Feb 27 14:39:41 2019 +0100 |
| committer | omar <omarcornut@gmail.com> | Wed Feb 27 14:39:41 2019 +0100 |
| tree | c1f8800ac49e1b05b2b8c6583d5611a04d84491b | |
| parent | def723b6b6301b580450edce0ff7797c148379c3 [diff] | |
| parent | b2e7a3806a3536ecfdd082ea0d3eafec1bcd9b0b [diff] |
Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch # Conflicts: # examples/imgui_impl_allegro5.cpp