3 Commits

Author	SHA1	Message	Date
omar	1c385c2ca4	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp # imgui.cpp # imgui_internal.h	2018-04-18 19:06:49 +02:00
omar	f7ef10e547	Examples: Titles/comments in headers	2018-02-21 23:05:17 +01:00
omar	6d0f9244b8	Examples: Allegro5, Marmalade: Moved bindings to parent folder. Renamed Allegro stuff from *A5_ to *Allegro5_	2018-02-18 20:26:20 +01:00