mirror of
				https://github.com/Drezil/imgui.git
				synced 2025-10-30 20:51:06 +01:00 
			
		
		
		
	Merge branch 'master' into viewport
# Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.cpp # examples/imgui_impl_win32.cpp # imgui.h # imgui_demo.cpp
This commit is contained in:
		| @@ -1,4 +1,4 @@ | ||||
| // dear imgui, v1.67 WIP | ||||
| // dear imgui, v1.66b | ||||
| // (internal structures/api) | ||||
|  | ||||
| // You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility! | ||||
|   | ||||
		Reference in New Issue
	
	Block a user