ocornut 9948535118 Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h # imgui_draw.cpp		2022-02-17 18:47:43 +01: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	Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest.	2021-06-08 17:08:49 +02: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	CI: Fixes for OSX + explicitely request C++11.	2022-02-15 17:25:11 +01:00