4 Commits (70b0bd13aa9f34b24ffce14ccdd19cfc05578746)

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	7 years ago
omar	cdf51cad2d	Comments, documentation	7 years ago
omar	9660657e95	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp	7 years ago
omar	8d58fbb5ed	Examples: Renamed example folders. (#1870)	7 years ago