8 Commits (ce18371d1bd331fc03c7ff22686bff1453b733f4)

Author	SHA1	Message	Date
omar	14cef31467	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	6 years ago
omar	6201cad2b4	Examples: Comments, Demo: Log early out, TODO. (#1553)	6 years ago
omar	c38fe6b0e1	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	6 years ago
omar	20e89201cb	Examples: Fixes.	6 years ago
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	6 years ago
omar	cdf51cad2d	Comments, documentation	6 years ago
omar	9660657e95	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp	6 years ago
omar	8d58fbb5ed	Examples: Renamed example folders. (#1870)	6 years ago