4 Commits (ce18371d1bd331fc03c7ff22686bff1453b733f4)

Author SHA1 Message Date
omar ce500f8727 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_win32.cpp
6 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) 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