2 Commits (9660657e95c9ba68e13e15ebaa91503f6d7fbb3f)

Author SHA1 Message Date
omar 9660657e95 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_sdl.cpp
6 years ago
omar 5a13e4dcde Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp (#1870) + changelog bits 6 years ago