4 commits

Author	SHA1	Message	Date
omar	24aeca3d0c	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_glfw.h # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # examples/imgui_impl_vulkan.h # examples/imgui_impl_win32.cpp	2018-06-12 16:24:24 +02:00
omar	7acb46bec5	Examples: Comments to make ImGuiConfigFlags_NoMouseCursorChange more visible (#1027). + Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag.	2018-06-11 12:33:51 +02:00
omar	9660657e95	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp	2018-06-10 15:59:35 +02:00
omar	5a13e4dcde	Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp (#1870) + changelog bits	2018-06-10 15:58:21 +02:00

Renamed from examples/imgui_impl_sdl2.cpp (Browse further)