Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.h
#	imgui_demo.cpp

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx11.h
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_dx9.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	examples/imgui_impl_osx.h
#	examples/imgui_impl_osx.mm
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h

Changelog, minor tweaks. (#2585)

Examples: imgui_impl_osx: Added mouse cursor support. (#2585, #1873)

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp

Update changelog, comments, made empty/no-text clipboard return NULL as with other implementation. Minor style tweaks. (#2546) ...

Fixed IMGUI_DISABLE_WIN32_FUNCTIONS not disabling IME code.

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

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h

IO: changed AddInputCharacter(unsigned short c) signature to AddInputCharacter(unsigned int c). ...

Examples/Backends: Don't filter characters under 0x10000 before calling io.AddInputCharacter(), the filtering is done in io.AddInputCharacter() itself. This is in prevision for fuller Unicode support. (#2538, #2541)

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_vulkan.h
#	imgui.cpp

Removed trailing spaces (#2038, #2299)

About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_win32.cpp
#	imgui.h

About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp

Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.

Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. (#2078)

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp

Examples: imgui_impl_osx: Fix for incorrect DeltaTime calculation on mac OS. (#1978)

Merge branch 'master' into viewport ...

# Conflicts:
#	imgui.cpp

Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments

OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. (#1873)

Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. (#1873)

Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. (#1873)

Examples: Added imgui_impl_osx.mm bindings (#1870, #281)