ocornut 958e58b06b Merge branch 'master' into docking ... # Conflicts: # examples/example_apple_opengl2/main.mm # imgui.cpp		2020-10-01 13:33:08 +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	2020-10-01 13:33:08 +02:00