ocornut 5d472c4895 Merge branch 'master' into docking + fixes for #3259 ... # Conflicts: # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_sdl.cpp # imgui.cpp		2020-05-25 18:32:15 +02: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 + fixes for #3259	2020-05-25 18:32:15 +02:00