55 Commits

Author	SHA1	Message	Date
omar	20e89201cb	Examples: Fixes.	2018-06-23 09:42:47 +02:00
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	cdf51cad2d	Comments, documentation	2018-06-11 19:52:40 +02:00
omar	9660657e95	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp	2018-06-10 15:59:35 +02:00
omar	8d58fbb5ed	Examples: Renamed example folders. (#1870)	2018-06-10 15:42:14 +02:00