omar 4ff23d3306 Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx9.cpp # imgui.cpp # imgui.h		2018-05-07 22:23:58 +02:00
..
data	Merge branch 'master' of https://github.com/ocornut/imgui	2015-10-14 23:01:52 +02:00
main.cpp	Merge branch 'master' into viewport	2018-05-07 22:23:58 +02:00
marmalade_example.mkb	Examples: Allegro5, Marmalade: Moved bindings to parent folder. Renamed Allegro stuff from *A5_ to *Allegro5_	2018-02-18 20:26:20 +01:00