You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
ocornut 377b864bb4 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
3 years ago
..
build_win32.bat Examples: Fix batch files (amend b1a18d82, #3513), standardize them + DirectX12: Move ImGui::Render() call above the first barrier to clarify its lack of effect on the graphics pipe. 4 years ago
example_win32_directx11.vcxproj Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest. 3 years ago
example_win32_directx11.vcxproj.filters Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis' 4 years ago
main.cpp Merge branch 'master' into docking 3 years ago