ocornut 
							
						 
					 
					
						
						
							
						
						e278277d53 
					 
					
						
						
							
							IO: added AddMouseViewportEvent() + used in backends.  
						
						 
						
						
						
						
					 
					
						2022-01-18 17:24:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						1338eb31f7 
					 
					
						
						
							
							Viewports: Relaxed specs for backend supporting ImGuiBackendFlags_HasMouseHoveredViewport. Backends: SDL: Added support for simplified HasMouseHoveredViewport. ( #1542 ,  #4665 )  
						
						 
						
						
						
						
					 
					
						2022-01-18 17:01:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						8567a4cca3 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui_demo.cpp
#	imgui_internal.h 
						
						
					 
					
						2022-01-17 18:19:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						b8e56dce83 
					 
					
						
						
							
							IO: Added AddMousePosEvent(), AddMouseButtonEvent(), AddMouseWheelEvent() api + updated all Backends. ( #4858 ) (input queue code will be next commit)  
						
						 
						
						... 
						
						
						
						Details: note that SDL, OSX and GLFW backends removed recording of MouseJustPressed[] which will be unnecessary with input queue (which is the NEXT commit). (#2787 , #1992 , #3383 , #2525 , #1320 ) 
						
						
					 
					
						2022-01-17 17:35:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						b6582a471a 
					 
					
						
						
							
							Backends: OSX: Fix Game Controller nav mapping to use shoulder for both focusing and tweak speed. ( #4759 )  
						
						 
						
						
						
						
					 
					
						2022-01-17 16:22:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						92c4ff1c2f 
					 
					
						
						
							
							Rename ImGuiKey_LeftControl to ImGuiKey_LeftCtrl, ImGuiKey_RightControl to ImGuiKey_RightCtrl + made key order match mods order. ( #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-17 15:42:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						0755767440 
					 
					
						
						
							
							Backends: move io.AddKeyModsEvent() next to io.AddKeyEvent() submission, rely on mods from platform/source. ( #4858 ) +  fix   #2622  again broken by  746c9f7 
						
						 
						
						... 
						
						
						
						Amended to submit modifiers before. 
						
						
					 
					
						2022-01-17 15:21:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								RandomErrorMessage 
							
						 
					 
					
						
						
							
						
						45c4365ec3 
					 
					
						
						
							
							Backends: GLFW: glfwGetKeyName is not implemented in emscripten ( #4907 ,  #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-14 11:54:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						6188e94108 
					 
					
						
						
							
							Examples: Vulkan: fill Subpass and MSAASamples to increase discoverability ( #4886 ) + IO docs update ( #4858 )  
						
						 
						
						... 
						
						
						
						https://github.com/mosra/magnum-integration/pull/89  
						
						
					 
					
						2022-01-14 11:51:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						ec1e57ed4a 
					 
					
						
						
							
							Merge "Backends: SDL: Fix for Emscriptem. Amend 98ce013." + Fix bad merge from master of "is_app_focused" property (Amend  0647ba3)  
						
						 
						
						
						
						
					 
					
						2022-01-13 18:55:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						553b04883e 
					 
					
						
						
							
							Backends: SDL: Fix for Emscriptem. Amend  98ce013.  
						
						 
						
						
						
						
					 
					
						2022-01-13 18:52:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						0647ba3bad 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp 
						
						
					 
					
						2022-01-13 18:36:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						200a8f1ea2 
					 
					
						
						
							
							Backends: GLFW: Update mouse inputs using glfwSetCursorPosCallback() (breaking) + fallback to provide it when focused but not hovered/captured + update MousePos before MouseButtons.  
						
						 
						
						... 
						
						
						
						+ Allegro5 remove unnecessary clear. 
						
						
					 
					
						2022-01-12 17:48:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						98ce013242 
					 
					
						
						
							
							Backends: SDL: Update mouse inputs using SDL_MOUSEMOTION/SDL_WINDOWEVENT_LEAVE + fallback to provide it when focused but not hovered/captured + update MousePos before MouseButtons.  
						
						 
						
						
						
						
					 
					
						2022-01-12 17:48:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						bf4de2a46b 
					 
					
						
						
							
							Backends: Win32: Update mouse inputs using WM_MOUSEMOVE/WM_MOUSELEAVE + fallback to provide it when focused but not hovered/captured + update MousePos before Key Modifiers.  
						
						 
						
						
						
						
					 
					
						2022-01-12 17:48:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						7f8a89c25c 
					 
					
						
						
							
							Backends: Win32, SDL: maintain MouseButtonsDown instead of using IsAnyMouseDown(). Internals: added GetInputSourceName().  
						
						 
						
						
						
						
					 
					
						2022-01-12 16:12:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Liu Liu 
							
						 
					 
					
						
						
							
						
						457d4b7b72 
					 
					
						
						
							
							Backends: OSX: Adedd basic IME support for macOS. ( #3108 ,  #2598 )  
						
						 
						
						
						
						
					 
					
						2022-01-12 14:37:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Théo Monnom 
							
						 
					 
					
						
						
							
						
						0818a42396 
					 
					
						
						
							
							Backend: WebGPU: Fixed incorrect size parameters in WGPU backend ( #4891 )  
						
						 
						
						... 
						
						
						
						+ squash SDL alignment bits. 
						
						
					 
					
						2022-01-12 14:16:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						956e03009a 
					 
					
						
						
							
							Backends: OSX: Build fIx. Made GetKeyName() input tolerant. Internals: added GetNavInputName().  
						
						 
						
						
						
						
					 
					
						2022-01-11 18:48:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						acfc7798fd 
					 
					
						
						
							
							Rename io.AddKeyModEvent() -> io.AddKeyModsEvent() and updated backends accordingly. ( #2625 ,  #4858 )  
						
						 
						
						... 
						
						
						
						Amend 790132a  (breaking)
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp 
						
						
					 
					
						2022-01-10 17:01:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						e8172fdfbc 
					 
					
						
						
							
							Rename io.AddKeyModEvent() -> io.AddKeyModsEvent() and updated backends accordingly. ( #2625 ,  #4858 )  
						
						 
						
						... 
						
						
						
						Amend 790132a  (breaking) 
						
						
					 
					
						2022-01-10 17:00:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						9ce0f35ef3 
					 
					
						
						
							
							Backends: OSX: Fixed typo.  
						
						 
						
						
						
						
					 
					
						2022-01-10 15:48:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						b2e2cc44c2 
					 
					
						
						
							
							Backends: OSX: Fixed typo.  
						
						 
						
						
						
						
					 
					
						2022-01-10 15:47:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						ef681e7019 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_sdl.h
#	backends/imgui_impl_win32.cpp
#	backends/imgui_impl_win32.h
#	imgui.cpp 
						
						
					 
					
						2022-01-10 15:24:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						790132a672 
					 
					
						
						
							
							Added io.AddKeyModEvent() and updated backends accordingly. ( #2625 ,  #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-10 15:17:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						1797135db5 
					 
					
						
						
							
							Backends: Android: Update to use io.AddEventKey() will full key map ( #2625 ,  #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-10 15:15:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						ee436aa803 
					 
					
						
						
							
							Backends: OSX: Update to use io.AddEventKey() will full key map ( #2625 ,  #1873 ,  #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-10 15:14:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						da1864d79e 
					 
					
						
						
							
							Backends: GLUT: Update to use io.AddEventKey() will full key map ( #2625 ,  #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-10 15:14:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						1bfe4a75be 
					 
					
						
						
							
							Backends: Allegro5: Update to use io.AddEventKey() will full key map ( #2625 ,  #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-10 15:13:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						fe646ea591 
					 
					
						
						
							
							Backends: SDL2: Update to use io.AddEventKey() will full key map ( #2625 ,  #4858 ) + created localized key (using keycode instead of scancode) ( #456 )  
						
						 
						
						... 
						
						
						
						Legacy indexing stills uses Scancode 
						
						
					 
					
						2022-01-10 15:12:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						ecd212c01d 
					 
					
						
						
							
							Backends: GLFW: Update to use io.AddEventKey() will full key map ( #2625 ,  #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-10 15:12:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						746c9f76e4 
					 
					
						
						
							
							Backends: Win32: Update to use io.AddEventKey() will full key map ( #2625 ,  #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-10 15:11:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						afffcd5810 
					 
					
						
						
							
							Inputs: rename ImGuiKey_KeyPadEnter > ImGuiKey_KeypadEnter ( #2625 )  
						
						 
						
						
						
						
					 
					
						2022-01-06 14:25:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						100ede5764 
					 
					
						
						
							
							Backends: GLFW: Fix CTRL+A, CTRL+Y, CTRL+Z to match keyboard layout. Converting GLFW untranslated keycodes back to translated keycodes. ( #456 ,  #2625 )  
						
						 
						
						
						
						
					 
					
						2022-01-05 16:57:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						704ab1114a 
					 
					
						
						
							
							Merge branch 'master' into docking. Remove Platform_SetImeInputPos. Remove backend-side IME implementation. Rrevert removal of MouseDragMaxDistanceAbs in  206b9ea. ( #2589 ,  #3113 )  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
#	imgui_widgets.cpp 
						
						
					 
					
						2022-01-05 14:30:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						3a90dc3893 
					 
					
						
						
							
							Platform IME: changed io.ImeSetInputScreenPosFn() to io.SetPlatformImeDataFn() API.  
						
						 
						
						... 
						
						
						
						Ref #2589 , #2598 , #3108 , #3113 , #3653 , #4642  
						
						
					 
					
						2022-01-05 13:47:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						efa50f72a7 
					 
					
						
						
							
							Backends: Metal: Ignore ImDrawCmd where ElemCount == 0. ( #4857 )  
						
						 
						
						
						
						
					 
					
						2022-01-03 22:14:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						2aa9959553 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt 
						
						
					 
					
						2021-12-30 21:42:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								luigifcruz 
							
						 
					 
					
						
						
							
						
						41e39ea6e1 
					 
					
						
						
							
							Backends: Metal: Add Metal C++ bindings support. ( #4824 ,  #4746 )  
						
						 
						
						
						
						
					 
					
						2021-12-30 15:04:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						dbeea7220f 
					 
					
						
						
							
							Backends: Silence overzealous warnings. ( #4834 ) Add comments about SetDragDropPayload() return value. ( #4835 )  
						
						 
						
						
						
						
					 
					
						2021-12-29 12:44:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						89a28209e8 
					 
					
						
						
							
							Version 1.87 WIP + Backends: OpenGL3: Fixed a buffer overflow in imgui_impl_opengl3_loader.h init, added in 1.86 ( #4468 ,  #4830 )  
						
						 
						
						
						
						
					 
					
						2021-12-26 20:02:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						15b4a064f9 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_win32.cpp
#	examples/example_marmalade/main.cpp
#	imgui.cpp
#	imgui.h 
						
						
					 
					
						2021-12-22 16:02:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sean Ridenour 
							
						 
					 
					
						
						
							
						
						4bad852a78 
					 
					
						
						
							
							Backends: SDL_Renderer: Handle change to SDL_RenderGeometryRaw() function signature in SDL 2.0.19 ( #4819 )  
						
						 
						
						
						
						
					 
					
						2021-12-21 14:32:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						d9bc1e44af 
					 
					
						
						
							
							Backends: Marmalade: Removed obsolete Marmalade backend (imgui_impl_marmalade.cpp) + example. ( #368 ,  #375 )  
						
						 
						
						
						
						
					 
					
						2021-12-20 19:29:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						0cdc4a9565 
					 
					
						
						
							
							Backends: Win32: Store left/right variants of Ctrl/Shift/Alt mods in KeysDown[] array. ( #2625 )  
						
						 
						
						... 
						
						
						
						Technically not much required yet but will be by extra-keys work. fix miscleared GLFW field for consistency (no effect) 
						
						
					 
					
						2021-12-16 18:16:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						cd36acc88b 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	imgui.cpp 
						
						
					 
					
						2021-12-15 12:10:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						389982eb5a 
					 
					
						
						
							
							Backends: OpenGL3: Using buffer orphaning + glBufferSubData(), seems to fix leaks with multi-viewports with some Intel HD drivers.. ( #4468 ,  #4504 ,  #2981 ,  #3381 )  
						
						 
						
						
						
						
					 
					
						2021-12-15 11:50:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stuart Carnie 
							
						 
					 
					
						
						
							
						
						1b6b8602c1 
					 
					
						
						
							
							Backends: OSX: Fix keyboard support. Handle scroll cancel. Don't set mouse cursor shape unconditionally. ( #4759 ,  #4253 ,  #1873 )  
						
						 
						
						... 
						
						
						
						Note the original FIXME: refered to GLFWs Cocoa implementation, which is largely what this commit provides. 
						
						
					 
					
						2021-12-13 11:56:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stuart Carnie 
							
						 
					 
					
						
						
							
						
						b720f1f03c 
					 
					
						
						
							
							Backends: OSX: Add Game Controller support. ( #4759 )  
						
						 
						
						
						
						
					 
					
						2021-12-13 11:25:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						e31d116d37 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_opengl2.cpp
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2021-12-09 11:52:23 +01:00