omar 813e0c18e6 Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx11.h
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx12.h
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_dx9.h
#	examples/imgui_impl_metal.h
#	examples/imgui_impl_metal.mm
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	examples/imgui_impl_vulkan.cpp
#	imgui.cpp
#	imgui.h
#	imgui_internal.h

2019-11-26 12:23:43 +01:00

..

example_apple_opengl2.xcodeproj

Add native mac copy/paste support to match win32 (#2546)

2019-05-18 17:34:58 +02:00

main.mm

Merge branch 'master' into docking

2019-11-26 12:23:43 +01:00