ocornut 34d4bc620d Merge remote-tracking branch 'origin/master' into docking ... # Conflicts: # backends/imgui_impl_opengl3.cpp		2021-04-15 19:57:52 +02:00
..
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.	2020-12-09 18:28:02 +01:00
example_glfw_opengl2.vcxproj	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	2021-03-11 16:21:46 +01:00
example_glfw_opengl2.vcxproj.filters	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	2021-03-11 16:21:46 +01:00
main.cpp	Merge branch 'master' into docking	2021-02-18 11:41:27 +01:00
Makefile	Update example makefiles to check the new homebrew paths (#4003)	2021-04-06 12:46:09 +02:00