Michel Lesoinne 
							
						 
					 
					
						
						
							
						
						90deb0959a 
					 
					
						
						
							
							Backends, Viewports: Vulkan: Fix the use of the incorrect fence in wait for fence. ( #4208 )  
						
						 
						
						... 
						
						
						
						The fence being waited upon was not the one associated with the current frame.
This results in validation error detecting a reset of command buffers still in use and resetting fences while still in use.
Read more details in #4208  
						
						
					 
					
						2021-06-14 17:54:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						a44d4da87c 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_win32.cpp 
						
						
					 
					
						2021-06-08 18:38:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						b66529fe3e 
					 
					
						
						
							
							Backends: Win32: Rework to handle certains Windows 8.1/10 features without a manifest. ( #4200 ,  #4191 )  
						
						 
						
						
						
						
					 
					
						2021-06-08 18:38:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tatsuya Yatagawa 
							
						 
					 
					
						
						
							
						
						fe24591411 
					 
					
						
						
							
							Backends: OpenGL3: Fix access violation due to NULL from glGetStringi. ( #4201 )  
						
						 
						
						
						
						
					 
					
						2021-06-05 16:27:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						16abfa5eb6 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp 
						
						
					 
					
						2021-06-04 17:28:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						838c16533d 
					 
					
						
						
							
							Backends: Comments.  
						
						 
						
						
						
						
					 
					
						2021-05-27 13:59:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						1ad1429c6d 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt 
						
						
					 
					
						2021-05-25 18:45:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						556689591c 
					 
					
						
						
							
							Backends: OpenGL3: Handle GL_CLIP_ORIGIN on <4.5 contexts if "GL_ARB_clip_control" extension is detected. ( #4170 ,  #3998 )  
						
						 
						
						... 
						
						
						
						Expecting this to somehow cause another issue but we will fix it when it comes. 
						
						
					 
					
						2021-05-24 23:46:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						1b435ae3e0 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt 
						
						
					 
					
						2021-05-24 17:49:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladimir Davidovich 
							
						 
					 
					
						
						
							
						
						142c866bd9 
					 
					
						
						
							
							Backends: WebGPU: Support draw_data->FramebufferScale ( #4163 )  
						
						 
						
						
						
						
					 
					
						2021-05-24 17:12:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						86c2b609ef 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp 
						
						
					 
					
						2021-05-19 19:05:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						fd06dc511f 
					 
					
						
						
							
							Backends: GLFW: Adding bound check in KeyCallback because GLFW appears to send -1 on some setups. [ #4124 ]  
						
						 
						
						
						
						
					 
					
						2021-05-19 19:03:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						4181ccceea 
					 
					
						
						
							
							Backends: WebGPU: Fix build, amend   3c72e51. ( #3761 )  
						
						 
						
						
						
						
					 
					
						2021-05-19 18:50:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						3c72e5142b 
					 
					
						
						
							
							Backends: Replace direct access to TextureId with GetTexID() call in ImDrawCmd. ( #3761 )  
						
						 
						
						
						
						
					 
					
						2021-05-19 18:39:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								warriormaster12 
							
						 
					 
					
						
						
							
						
						2cdfcb8fd2 
					 
					
						
						
							
							Backends: Vulkan: Fix for using IMGUI_IMPL_VULKAN_NO_PROTOTYPES ( #4151 ,  #3759 ,  #3227 )  
						
						 
						
						
						
						
					 
					
						2021-05-18 15:08:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Basil Fierz 
							
						 
					 
					
						
						
							
						
						83bdfef8e0 
					 
					
						
						
							
							Backends: WGPU: update to latest specs. ( #4116 ,  #3632 )  
						
						 
						
						... 
						
						
						
						Merged 13 commits. 
						
						
					 
					
						2021-05-16 19:09:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mertcan Davulcu 
							
						 
					 
					
						
						
							
						
						cbcd89152b 
					 
					
						
						
							
							Backends: Android: Tweaks. ( #4034 )  
						
						 
						
						
						
						
					 
					
						2021-05-07 17:43:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hattrick HttrckCldHKS 
							
						 
					 
					
						
						
							
						
						a8dcab8e2a 
					 
					
						
						
							
							Backends: DX9: Fix potential resource leak ( #4093 )  
						
						 
						
						
						
						
					 
					
						2021-05-07 15:17:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						31290807dc 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						+ fix warning fix for mingw+dx9
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	imgui.cpp 
						
						
					 
					
						2021-04-30 22:52:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						d28535f351 
					 
					
						
						
							
							Fixes for Visual Studio 2019 static analyzers. ( #3938 ,  #4073 ) + two minor edge case were invalid scalar input (e.g. a sign only) would return buffer as modified.  
						
						 
						
						
						
						
					 
					
						2021-04-29 17:10:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jarhmander 
							
						 
					 
					
						
						
							
						
						7b8932554e 
					 
					
						
						
							
							Backends: Win32: Change the case of XInput.h include, so it cross-compile nicely on unices. ( #4074 )  
						
						 
						
						
						
						
					 
					
						2021-04-26 09:29:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						06545c4f2a 
					 
					
						
						
							
							Backends: DirectX9: explicitely setting up more graphics states to increase compatibility with unusual non-default states. ( #4063 )  
						
						 
						
						... 
						
						
						
						Added D3DRS_FILLMODE, D3DRS_ZWRITEENABLE, D3DRS_RANGEFOGENABLE, D3DRS_SPECULARENABLE, D3DRS_STENCILENABLE, D3DRS_CLIPPING. Reordered some to match order in DX9 headers. 
						
						
					 
					
						2021-04-23 18:39:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						33cdbe97b8 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2021-04-19 20:05:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rokups 
							
						 
					 
					
						
						
							
						
						6d53884487 
					 
					
						
						
							
							Backends: OSX: Fix keys remaining stuck in pressed state when CMD-tabbing to a different application. ( #3832 )  
						
						 
						
						
						
						
					 
					
						2021-04-19 15:15:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						34d4bc620d 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_opengl3.cpp 
						
						
					 
					
						2021-04-15 19:57:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						858ea17eba 
					 
					
						
						
							
							Backends: DirectX10, DirectX11: fixed a crash when backing/restoring state if nothing is bound when entering the rendering function. ( #4045 )  
						
						 
						
						
						
						
					 
					
						2021-04-15 13:29:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Jones 
							
						 
					 
					
						
						
							
						
						71dda216ef 
					 
					
						
						
							
							Backends: OpenGL3: Don't try to read GL_CLIP_ORIGIN unless we're OpenGL 4.5. ( #3998 ,  #2366 ,  #2186 )  
						
						 
						
						
						
						
					 
					
						2021-04-06 12:39:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rokas Kupstys 
							
						 
					 
					
						
						
							
						
						a4adf60576 
					 
					
						
						
							
							Backends, Viewports: GLFW: Add a workaround for stuck keys after closing a GLFW window ( #3837 ).  
						
						 
						
						
						
						
					 
					
						2021-03-26 12:49:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						e7577d570e 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp 
						
						
					 
					
						2021-03-25 16:57:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						1491d2c916 
					 
					
						
						
							
							Backends: Win32: Clearing keyboard down array when losing focus (WM_KILLFOCUS). ( #2062 ,  #3532 ,  #3961 )  
						
						 
						
						
						
						
					 
					
						2021-03-23 16:48:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikolai Wuttke 
							
						 
					 
					
						
						
							
						
						186b734db0 
					 
					
						
						
							
							Backends: SDL2: Extend global mouse pos availability check ( #3950 )  
						
						 
						
						
						
						
					 
					
						2021-03-22 15:08:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Asper 
							
						 
					 
					
						
						
							
						
						6d3a980f38 
					 
					
						
						
							
							Backends: Vulkan: Fix mapped memory validation error when buffer sizes are not multiple of VkPhysicalDeviceLimits::nonCoherentAtomSize. ( #3957 )  
						
						 
						
						... 
						
						
						
						If using Vulkan backend and either vertex_size or index_size is not aligned to VkPhysicalDeviceLimits::nonCoherentAtomSize, then the call to vkFlushMappedMemoryRanges in ImGui_ImplVulkan_RenderDrawData will result to validation error. 
						
						
					 
					
						2021-03-22 12:41:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						085cff2fe5 
					 
					
						
						
							
							Viewports, Backends: Vulkan: Rebuild swapchain on VK_SUBOPTIMAL_KHR. ( #3881 )  
						
						 
						
						
						
						
					 
					
						2021-03-18 18:16:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						61a0908713 
					 
					
						
						
							
							Tables comments + Backends: DirectX9: calling IDirect3DStateBlock9::Capture() after CreateStateBlock() which appears to workaround/fix state restoring issues. . ( #3857 )  
						
						 
						
						
						
						
					 
					
						2021-03-18 18:04:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						412d6f7efe 
					 
					
						
						
							
							Fixes zealous MSVC static analyzers warnings ( #3938 )  
						
						 
						
						... 
						
						
						
						Other unfixed as I'm not happy with caving to false positives of every analyzers. 
						
						
					 
					
						2021-03-18 16:10:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rokas Kupstys 
							
						 
					 
					
						
						
							
						
						0c5b0c8b97 
					 
					
						
						
							
							Internals: Add a way to request window to not process any interactions for specified number of frames.  
						
						 
						
						
						
						
					 
					
						2021-03-18 14:19:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						d5a4d53000 
					 
					
						
						
							
							Viewports, Backend: SDL: Fix missing ImGuiBackendFlags_HasSetMousePos flag in docking branch (ok in master), GLFW: Fix application of WantSetMousePos. ( #1542 ,  #787 )  
						
						 
						
						... 
						
						
						
						Shows how little this feature is used with nav (was designed for small devices and frankly may be dropped) - but the backend support itself we will make use of for other features. 
						
						
					 
					
						2021-03-05 17:22:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						80533ea5e1 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp 
						
						
					 
					
						2021-03-05 16:04:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						8dd692c29c 
					 
					
						
						
							
							Android: Amend backend and examples with minor consistency tweaks. ( #3446 )  
						
						 
						
						
						
						
					 
					
						2021-03-04 11:07:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								duddel 
							
						 
					 
					
						
						
							
						
						fb85c0341b 
					 
					
						
						
							
							Add Android backend and example ( #3446 )  
						
						 
						
						
						
						
					 
					
						2021-03-04 10:35:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						662535f357 
					 
					
						
						
							
							Backends: DX9: Fix handling of colored textures ( #3844 ,  #3868 )  
						
						 
						
						
						
						
					 
					
						2021-03-03 18:34:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						6aee4bcdc5 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp 
						
						
					 
					
						2021-03-02 18:27:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						4537d98d46 
					 
					
						
						
							
							Backends: DX9: Fix to support colored glyphs, using newly introduced 'TexPixelsUseColors' info. ( #3369 ,  #3844 )  
						
						 
						
						
						
						
					 
					
						2021-03-02 15:04:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Xiliusha 
							
						 
					 
					
						
						
							
						
						eb57484935 
					 
					
						
						
							
							Backends: DX9: add missing IMGUI_USE_BGRA_PACKED_COLOR support. Remove dinput.h headers. ( #3844 )  
						
						 
						
						
						
						
					 
					
						2021-03-02 15:04:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						c154629152 
					 
					
						
						
							
							Backends: Win32: Added ImGui_ImplWin32_EnableAlphaCompositing() helper. ( #2766 ,  #3447 )  
						
						 
						
						... 
						
						
						
						Pragma linking with dwmapi.lib (Vista-era, ~9 kb). MinGW users will need to link with -ldwmapi. 
						
						
					 
					
						2021-02-18 16:04:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						a4e4f57cb0 
					 
					
						
						
							
							Examples: DX9-DX11: Removed half-assed DPI awareness enable. Updated Docking/Viewports part of Changelog (e.g. removed bits that are now already in master, clarified some added bits)  
						
						 
						
						
						
						
					 
					
						2021-02-18 12:55:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						ffa863a3ba 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	imgui.cpp 
						
						
					 
					
						2021-02-18 11:41:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						bda12e5fdd 
					 
					
						
						
							
							Backends: Rework blending equation to preserve alpha in output buffer accross all backends. ( #2693 ,  #2764 ,  #2766 ,  #2873 ,  #3447 ,  #3813 ,  #3816 )  
						
						 
						
						... 
						
						
						
						Some of the viewport ideas from #2766  are not in there yet (e.g. Vulkan: setting compositeAlpha based on cap.supportedCompositeAlpha) 
						
						
					 
					
						2021-02-18 11:38:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						27a5bdb916 
					 
					
						
						
							
							Backends: Win32: Fixed ImGui_ImplWin32_EnableDpiAwareness() attempting to get SetProcessDpiAwareness from shcore.dll on Windows 8 whereas it is only supported on Windows 8.1.  
						
						 
						
						... 
						
						
						
						+ Added other helpers for reference (unused currently, other features will want them) 
						
						
					 
					
						2021-02-17 19:41:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						239d09804d 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt 
						
						
					 
					
						2021-02-10 21:28:16 +01:00