mirror of
				https://github.com/Drezil/imgui.git
				synced 2025-11-03 22:51:06 +01:00 
			
		
		
		
	Merge branch 'master' into viewport
# Conflicts: # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_vulkan.cpp
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
			
		||||
// ImGui Renderer for: OpenGL2 (legacy OpenGL, fixed pipeline)
 | 
			
		||||
// dear imgui: Renderer for OpenGL2 (legacy OpenGL, fixed pipeline)
 | 
			
		||||
// This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..)
 | 
			
		||||
 | 
			
		||||
// Implemented features:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user