6 Commits (6277781e837e7419686866a03e68a7d0e7eb85b0)

Author	SHA1	Message	Date
omar	ce500f8727	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_win32.cpp	7 years ago
omar	f9a5ff7a19	Examples: DirectX12: Moved the ID3D12GraphicsCommandList* parameter from ImGui_ImplDX12_NewFrame() to ImGui_ImplDX12_RenderDrawData() which makes a lots more sense. (#301)	7 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	7 years ago
omar	6f7b7807ad	Fixed Travis path + various paths in comments/documentations	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